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

* Fix bug #50369.

Browse Source
This commit is contained in:
tanghucheng
2022-03-08 10:19:07 +08:00
parent 26cdbe280c
commit b279fbbc3e
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/control.class.php
+7 -7
View File
@@ -781,12 +781,9 @@ class baseControl
*/
$file2Included = $moduleControlFile;
$commonActionExtFile = $actionExtPath['custom'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
if(!empty($actionExtPath['vision']))
if(!empty($actionExtPath['common']))
{
$commonActionExtFile = $actionExtPath['vision'] . strtolower($methodName) . '.php';
$commonActionExtFile = $actionExtPath['common'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
}
@@ -796,12 +793,15 @@ class baseControl
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
}
if(!empty($actionExtPath['common']))
if(!empty($actionExtPath['vision']))
{
$commonActionExtFile = $actionExtPath['common'] . strtolower($methodName) . '.php';
$commonActionExtFile = $actionExtPath['vision'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
}
$commonActionExtFile = $actionExtPath['custom'] . strtolower($methodName) . '.php';
if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
if(!empty($actionExtPath['site']))
{
/**