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

* Revert loadConfigFromDB function.

Browse Source
This commit is contained in:
daitingting
2017-05-15 11:30:24 +08:00
parent eebb7e4cdb
commit 954a16cd15
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
-14
View File
@@ -125,20 +125,6 @@ class commonModel extends model
$this->config->system = isset($config['system']) ? $config['system'] : array();
$this->config->personal = isset($config[$account]) ? $config[$account] : array();
foreach($this->config->system as $module => $records)
{
/* Overide the items defined in config/config.php and config/my.php. */
if(!isset($this->config->$module)) $this->config->$module = new stdclass();
if(isset($this->config->system->$module)) helper::mergeConfig($this->config->system->$module, $module);
}
foreach($this->config->personal as $module => $records)
{
/* Overide the items defined in config/config.php and config/my.php. */
if(!isset($this->config->$module)) $this->config->$module = new stdclass();
if(isset($this->config->personal->$module)) helper::mergeConfig($this->config->personal->$module, $module);
}
/* Overide the items defined in config/config.php and config/my.php. */
if(isset($this->config->system->common)) helper::mergeConfig($this->config->system->common, 'common');
if(isset($this->config->personal->common)) helper::mergeConfig($this->config->personal->common, 'common');