merge sandbox to trunk for 1.4.4.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions

View file

@ -51,9 +51,6 @@
$use_sso = Context::get('use_sso');
if($use_sso !='Y') $use_sso = 'N';
$use_optimizer = Context::get('use_optimizer');
if($use_optimizer!='Y') $use_optimizer = 'N';
$time_zone = Context::get('time_zone');
$qmail_compatibility = Context::get('qmail_compatibility');
@ -79,7 +76,6 @@
$db_info->use_db_session = $use_db_session;
$db_info->use_rewrite = $use_rewrite;
$db_info->use_sso = $use_sso;
$db_info->use_optimizer = $use_optimizer;
$db_info->use_ssl = $use_ssl;
$db_info->use_mobile_view = $use_mobile_view;
if($http_port) $db_info->http_port = (int) $http_port;