mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-24 07:13:08 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1761

Browse Source
This commit is contained in:
Ryan Cramer
2023-06-22 12:44:04 -04:00
parent ead96474c6
commit 73ab10658c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/core/ModulesLoader.php
View File

@@ -486,7 +486,6 @@ class ModulesLoader extends ModulesClass {
$basename = basename($basename, '.module'); $basename = basename($basename, '.module');
$requires = array(); $requires = array();
$duplicates = $this->modules->duplicates(); $duplicates = $this->modules->duplicates();
$moduleInfo = null;
// check if module has duplicate files, where one to use has already been specified to use first // check if module has duplicate files, where one to use has already been specified to use first
$currentFile = $duplicates->getCurrent($basename); // returns the current file in use, if more than one $currentFile = $duplicates->getCurrent($basename); // returns the current file in use, if more than one
@@ -607,9 +606,8 @@ class ModulesLoader extends ModulesClass {
if($module === null) { if($module === null) {
// placeholder for a module, which is not yet included and instantiated // placeholder for a module, which is not yet included and instantiated
// if(!$moduleInfo) $moduleInfo = $this->getModuleInfo($basename); $ns = $this->modules->info->moduleInfoCache($basename, 'namespace');
$ns = $moduleInfo ? $moduleInfo['namespace'] : $this->modules->info->moduleInfoCache($basename, 'namespace'); if(empty($ns)) $ns = __NAMESPACE__ . "\\";
if(empty($namespace)) $ns = __NAMESPACE__ . "\\";
$singular = $info['flags'] & Modules::flagsSingular; $singular = $info['flags'] & Modules::flagsSingular;
$module = $this->newModulePlaceholder($basename, $ns, $pathname, $singular, $autoload); $module = $this->newModulePlaceholder($basename, $ns, $pathname, $singular, $autoload);
} }