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

Fix issue processwire/processwire-issues#1657

Browse Source
This commit is contained in:
Ryan Cramer
2023-07-27 09:24:40 -04:00
parent b656b254e8
commit d6ca1232e2
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/core/ModulesInfo.php
View File

@@ -649,12 +649,16 @@ class ModulesInfo extends ModulesClass {
if(!$info['installed'] && !$info['created'] && $installableFile) { if(!$info['installed'] && !$info['created'] && $installableFile) {
// uninstalled modules get their created date from the file or dir that they are in (whichever is newer) // uninstalled modules get their created date from the file or dir that they are in (whichever is newer)
$pathname = $installableFile; $pathname = $installableFile;
$filemtime = (int) filemtime($pathname); $filemtime = @filemtime($pathname);
if($filemtime === false) {
$info['created'] = 0;
} else {
$dirname = dirname($pathname); $dirname = dirname($pathname);
$coreModulesPath = $this->modules->coreModulesPath; $coreModulesPath = $this->modules->coreModulesPath;
$dirmtime = substr($dirname, -7) == 'modules' || strpos($dirname, $coreModulesPath) !== false ? 0 : (int) filemtime($dirname); $dirmtime = substr($dirname, -7) == 'modules' || strpos($dirname, $coreModulesPath) !== false ? 0 : (int) filemtime($dirname);
$info['created'] = $dirmtime > $filemtime ? $dirmtime : $filemtime; $info['created'] = $dirmtime > $filemtime ? $dirmtime : $filemtime;
} }
}
// namespace // namespace
if($info['core']) { if($info['core']) {

14
wire/core/ModulesInstaller.php
View File

@@ -116,10 +116,22 @@ class ModulesInstaller extends ModulesClass {
if($languages) $languages->setDefault(); if($languages) $languages->setDefault();
$pathname = $this->modules->installableFile($class); $pathname = $this->modules->installableFile($class);
if(strpos($class, "\\") === false) {
$ns = $this->modules->info->getModuleNamespace($class, array(
'file' => $pathname
));
$nsClass = $ns . $class;
} else {
$nsClass = $class;
}
if(!class_exists($nsClass, false)) {
$this->modules->files->includeModuleFile($pathname, $class); $this->modules->files->includeModuleFile($pathname, $class);
$this->modules->files->setConfigPaths($class, dirname($pathname)); $this->modules->files->setConfigPaths($class, dirname($pathname));
}
$module = $this->modules->newModule($class); $module = $this->modules->newModule($nsClass, $class);
if(!$module) return null; if(!$module) return null;
$flags = 0; $flags = 0;