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

* finish task #7299.

Browse Source
This commit is contained in:
z
2020-07-03 09:33:59 +08:00
parent b9c52535ad
commit 5227d6926b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+4 -5
View File
@@ -783,8 +783,8 @@ class baseControl
$moduleControlFile = $modulePath . 'control.php';
$actionExtPath = $this->app->getModuleExtPath($appName, $moduleName, 'control');
$file2Included = $moduleControlFile;
$classNameToFetch = $moduleName;
$realClassName = $moduleName;
if(!empty($actionExtPath))
{
/**
@@ -804,9 +804,8 @@ class baseControl
$file2Included = file_exists($siteActionExtFile) ? $siteActionExtFile : $file2Included;
}
/* Get real class name to include extended file. */
if(strpos($file2Included, DS . 'ext' . DS) !== false) $realClassName = stripos(file_get_contents($file2Included), "class my{$moduleName} extends $moduleName") === false ? $moduleName : "my{$moduleName}";
/* If class name is my{$moduleName} then set classNameToFetch for include this file. */
if(strpos($file2Included, DS . 'ext' . DS) !== false and stripos(file_get_contents($file2Included), "class my{$moduleName} extends $moduleName") !== false) $classNameToFetch = "my{$moduleName}";
}
/**
@@ -814,7 +813,7 @@ class baseControl
* Load the control file.
*/
if(!is_file($file2Included)) $this->app->triggerError("The control file $file2Included not found", __FILE__, __LINE__, $exit = true);
if(!class_exists($realClassName))
if(!class_exists($classNameToFetch))
{
chdir(dirname($file2Included));
helper::import($file2Included);