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

* Fix bug of load zen and tao.

Browse Source
This commit is contained in:
Guan Xiying
2022-10-18 17:19:18 +08:00
parent 8d961926a4
commit 01ac19f6e5
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+6 -4
View File
@@ -33,8 +33,10 @@ class control extends baseControl
{
parent::__construct($moduleName, $methodName, $appName);
$className = get_class($this);
if(strtolower(substr($className, -6)) == 'control') $this->loadModel($moduleName, $appName, 'zen');
if(!$moduleName) $moduleName = $this->moduleName;
$className = strtolower(get_class($this));
if($className == $moduleName || $className == 'my' . $moduleName) $this->loadModel($moduleName, $appName, 'zen');
$this->app->setOpenApp();
@@ -591,7 +593,7 @@ class control extends baseControl
public function __call($method, $arguments)
{
$moduleName = $this->app->getModuleName();
$taoClass = $moduleName . 'Tao';
$taoClass = $moduleName . 'Zen';
if(!is_callable(array($this->{$taoClass}, $method))) $this->app->triggerError("the module {$moduleName} has no {$method} method", __FILE__, __LINE__, $exit = true);
@@ -610,7 +612,7 @@ class control extends baseControl
{
global $app;
$moduleName = $app->getModuleName();
$taoClass = $moduleName . 'Tao';
$taoClass = $moduleName . 'Zen';
if(!is_callable("{$taoClass}::{$method}")) $app->triggerError("the module {$moduleName} has no {$method} method", __FILE__, __LINE__, $exit = true);
framework/model.class.php
+3 -6
View File
@@ -31,12 +31,9 @@ class model extends baseModel
{
parent::__construct($appName);
$className = get_class($this);
if(strtolower(substr($className, -5)) == 'model')
{
$moduleName = $this->app->getModuleName();
$this->loadModel($moduleName, $appName, 'tao');
}
$className = strtolower(get_class($this));
$moduleName = $this->app->getModuleName();
if($className == $moduleName . 'model' || $className == 'ext' . $moduleName . 'model') $this->loadModel($moduleName, $appName, 'tao');
}
/**