* code for task #2460.

2016-02-19 11:04:53 +08:00
parent 95de1da365
commit 33d94add3b
3 changed files with 462 additions and 473 deletions
@@ -951,13 +951,22 @@ class router
    public function loadCommon()
    {
        $this->setModuleName('common');
-        if($this->setControlFile($exitIfNone = false))
+        $commonModelFile = helper::setModelFile('common');
+        if(file_exists($commonModelFile))
        {
-            include $this->controlFile;
-            if(class_exists('common'))
+            helper::import($commonModelFile);
+            if(class_exists('extcommonModel'))
            {
-                return new common();
-            }    
+                $commonClass = 'class common extends extcommonModel{}';
+                eval($commonClass);
+                return new extcommonModel();
+            }
+            elseif(class_exists('commonModel'))
+            {
+                $commonClass = 'class common extends commonModel{}';
+                eval($commonClass);
+                return new commonModel();
+            }
            else
            {
                return false;