From 954a16cd15bbec9e1e697313d0473c4a826b014a Mon Sep 17 00:00:00 2001 From: daitingting Date: Mon, 15 May 2017 11:30:24 +0800 Subject: [PATCH] * Revert loadConfigFromDB function. --- module/common/model.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 21a96ac557..1c00655ea0 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -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');