GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE] Fix loading of settings from modules

Browse Source
This commit is contained in:
Hugo Sales
2021-11-08 15:05:55 +00:00
committed by Diogo Peralta Cordeiro
parent 019ad794d1
commit cd470cbf93
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/ModuleManager.php
View File

@@ -196,18 +196,18 @@ class ModuleManager
}
$container->loadFromExtension('twig', ['paths' => $templates]);
$modules = array_merge(glob(INSTALLDIR . '/components/*'), glob(INSTALLDIR . '/plugins/*'));
$parameters = [];
$modules = array_merge(glob(INSTALLDIR . '/components/*'), glob(INSTALLDIR . '/plugins/*'));
$module_configs = [];
foreach ($modules as $mod) {
$path = "{$mod}/config" . Kernel::CONFIG_EXTS;
$loader->load($path, 'glob'); // Is supposed to, but doesn't return anything that would let us identify if loading worked
foreach (explode(',', mb_substr(Kernel::CONFIG_EXTS, 2, -1)) as $ext) {
if (file_exists("{$mod}/config.{$ext}")) {
$parameters[basename(mb_strtolower($mod))] = basename(\dirname(mb_strtolower($mod)));
$module_configs[basename(mb_strtolower($mod))] = basename(\dirname(mb_strtolower($mod)));
break;
}
}
}
return $parameters;
return $module_configs;
}
}