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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,7 @@ class Context {
$this->db_info->lang_type = $site_module_info->default_language;
if(!$this->db_info->lang_type) $this->db_info->lang_type = 'en';
if(!$this->db_info->use_db_session) $this->db_info->use_db_session = 'N';
}
// Load Language File
@ -127,7 +128,7 @@ class Context {
$this->loadLang(_XE_PATH_.'modules/module/lang');
// set session handler
if(Context::isInstalled() && $this->db_info->use_db_session != 'N') {
if(Context::isInstalled() && $this->db_info->use_db_session == 'Y') {
$oSessionModel = &getModel('session');
$oSessionController = &getController('session');
session_set_save_handler(
@ -245,6 +246,7 @@ class Context {
if($db_info->qmail_compatibility != 'Y') $db_info->qmail_compatibility = 'N';
$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
if(!$db_info->use_db_session) $db_info->use_db_session = 'N';
if(!$db_info->use_ssl) $db_info->use_ssl = 'none';
$this->set('_use_ssl', $db_info->use_ssl);
@ -779,9 +781,13 @@ class Context {
static $url = null;
if(is_null($url)) {
$url = Context::getRequestUri();
if(count($_GET)) {
foreach($_GET as $key => $val) $vars[] = $key.'='.urlencode(Context::convertEncodingStr($val));
$url .= '?'.implode('&',$vars);
if(count($_GET))
{
foreach($_GET as $key => $val)
{
$vars[] = $key . '=' . ($val ? urlencode(Context::convertEncodingStr($val)) : '');
}
$url .= '?' . join('&', $vars);
}
}
return $url;
@ -1018,6 +1024,11 @@ class Context {
is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
$self->context->{$key} = $val;
if($set_to_get_vars === false) return;
if($val === NULL || $val === '')
{
unset($self->get_vars->{$key});
return;
}
if($set_to_get_vars || $self->get_vars->{$key}) $self->get_vars->{$key} = $val;
}
@ -1451,4 +1462,3 @@ class Context {
$map[$key] = $content;
}
}
?>