Merge branch 'sgm_upgrade' into 'sprint/185'

* Code for upgrade. See merge request easycorp/zentaopms!1899
2022-02-23 02:18:07 +00:00
parent 92bc66a943 3782342638
commit f70f6c9f6b
2 changed files with 406 additions and 820 deletions
@@ -259,7 +259,7 @@ class commonModel extends model
    {
        /* Get configs of system and current user. */
        $account = isset($this->app->user->account) ? $this->app->user->account : '';
-        if($this->config->db->name) $config = $this->loadModel('setting')->getSysAndPersonalConfig($account);
+        if($this->config->db->name and !defined('IN_UPGRADE')) $config = $this->loadModel('setting')->getSysAndPersonalConfig($account);
        $this->config->system   = isset($config['system']) ? $config['system'] : array();
        $this->config->personal = isset($config[$account]) ? $config[$account] : array();