fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 19:51:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.4.5 branche

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@8239 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-04-01 01:12:26 +00:00
parent 7d10ebd968
commit 825ccd8328
57 changed files with 932 additions and 645 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/context/Context.class.php
View file

@ -842,7 +842,7 @@ class Context {
// optional SSL use
} elseif($_use_ssl == 'optional') {
$ssl_mode = RELEASE_SSL;
if($get_vars['act'] && $self->_isExistsSSLAction($get_vars['act'])) $ssl_mode = ENFORCE_SSL;
if($get_vars['act'] && $self->isExistsSSLAction($get_vars['act'])) $ssl_mode = ENFORCE_SSL;
$query = $self->getRequestUri($ssl_mode, $domain).$query;
// no SSL
} else {
@ -1299,4 +1299,4 @@ class Context {
return $path;
}
}
?>
?>