Merge from 1.5.2.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10519 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-02 09:30:09 +00:00
parent 9bf08cf3df
commit 361cd64c16
86 changed files with 804 additions and 156 deletions

View file

@ -34,7 +34,11 @@
if(file_exists($install_config_file)){
include $install_config_file;
if(is_array($install_config)){
foreach($install_config as $k => $v) Context::set($k,$v,true);
foreach($install_config as $k => $v)
{
$v = ($k == 'db_table_prefix') ? $v.'_' : $v;
Context::set($k,$v,true);
}
unset($GLOBALS['__DB__']);
Context::set('install_config', true, true);
$oInstallController = &getController('install');