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

* merge new framework.

Browse Source
This commit is contained in:
wangyidong
2017-06-16 16:52:45 +08:00
parent db4eca22ae
commit d18cc65d90
28 changed files with 450 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/model.class.php
+6 -6
View File
@@ -146,7 +146,7 @@ class baseModel
$moduleName = $this->getModuleName();
if($this->config->framework->multiLanguage) $this->app->loadLang($moduleName, $this->appName);
if($moduleName != 'common') $this->app->loadModuleConfig($moduleName, $this->appName, $exitIfNone = false);
if($moduleName != 'common') $this->app->loadModuleConfig($moduleName, $this->appName);
$this->loadDAO();
$this->setSuperVars();
@@ -208,10 +208,10 @@ class baseModel
if(empty($moduleName)) return false;
if(empty($appName)) $appName = $this->appName;
global $singleModule;
if(isset($singleModule[$appName][$moduleName]))
global $loadedModels;
if(isset($loadedModels[$appName][$moduleName]))
{
$this->$moduleName = $singleModule[$appName][$moduleName];
$this->$moduleName = $loadedModels[$appName][$moduleName];
return $this->$moduleName;
}
@@ -225,8 +225,8 @@ class baseModel
if(!class_exists($modelClass)) $this->app->triggerError(" The model $modelClass not found", __FILE__, __LINE__, $exit = true);
}
$singleModule[$appName][$moduleName] = new $modelClass($appName);
$this->$moduleName = $singleModule[$appName][$moduleName];
$loadedModels[$appName][$moduleName] = new $modelClass($appName);
$this->$moduleName = $loadedModels[$appName][$moduleName];
return $this->$moduleName;
}