mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #1853 from wilr/config-notice-error
FIX: ensure config variables exist
This commit is contained in:
commit
399eacf12c
@ -248,19 +248,28 @@ class SS_ClassManifest {
|
||||
|
||||
/**
|
||||
* Returns an array of module names mapped to their paths.
|
||||
* "Modules" in SilverStripe are simply directories with a _config.php file.
|
||||
*
|
||||
* "Modules" in SilverStripe are simply directories with a _config.php
|
||||
* file.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getModules() {
|
||||
$modules = array();
|
||||
foreach($this->configs as $configPath) {
|
||||
$modules[basename(dirname($configPath))] = dirname($configPath);
|
||||
|
||||
if($this->configs) {
|
||||
foreach($this->configs as $configPath) {
|
||||
$modules[basename(dirname($configPath))] = dirname($configPath);
|
||||
}
|
||||
}
|
||||
foreach($this->configDirs as $configDir) {
|
||||
$path = preg_replace('/\/_config$/', '', dirname($configDir));
|
||||
$modules[basename($path)] = $path;
|
||||
|
||||
if($this->configDirs) {
|
||||
foreach($this->configDirs as $configDir) {
|
||||
$path = preg_replace('/\/_config$/', '', dirname($configDir));
|
||||
$modules[basename($path)] = $path;
|
||||
}
|
||||
}
|
||||
|
||||
return $modules;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user