Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* task#982.

Browse Source
This commit is contained in:
wangchunsheng
2012-12-12 02:18:16 +00:00
parent e9f11a3287
commit 0f963343f6
46 changed files with 346 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/router.class.php
+10 -3
View File
@@ -1405,12 +1405,19 @@ class router
}
/* Merge from the db configs. */
if(isset($config->system->$moduleName))
if($moduleName != 'common' and isset($config->system->$moduleName))
{
foreach($config->system->$moduleName as $item)
{
if($item->section) $config->{$moduleName}->{$item->section}->{$item->key} = $item->value;
if(!$item->section) $config->{$moduleName}->{$item->key} = $item->value;
if($item->section)
{
if(!isset($config->{$moduleName}->{$item->section})) $config->{$moduleName}->{$item->section} = new stdclass();
$config->{$moduleName}->{$item->section}->{$item->key} = $item->value;
}
else
{
if(!$item->section) $config->{$moduleName}->{$item->key} = $item->value;
}
}
}