* finish task #4912.

2018-09-26 13:49:02 +08:00
parent ce3a23585d
commit 556af243fa
8 changed files with 73 additions and 54 deletions
@@ -207,12 +207,7 @@ class editorModel extends model
            $langFile = dirname(key($files)) . DS . 'lang' . DS . $this->cookie->lang. '.php';
            if(file_exists($langFile))
            {
-                if(!isset($lang))
-                {
-                    $lang = new stdclass();
-                    $lang->projectCommon = $this->lang->projectCommon;
-                    $lang->productCommon = $this->lang->productCommon;
-                }
+                if(!isset($lang)) $lang = $this->lang;
                if(!isset($lang->$module)) $lang->$module = new stdclass();
                include_once $langFile;
            }