tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1853 from wilr/config-notice-error

Browse Source 
FIX: ensure config variables exist
This commit is contained in:
Ingo Schommer 2013-05-08 02:49:39 -07:00
commit 399eacf12c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/manifest/ClassManifest.php
View File

@ -248,19 +248,28 @@ class SS_ClassManifest {
/** /**
* Returns an array of module names mapped to their paths. * 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 * @return array
*/ */
public function getModules() { public function getModules() {
$modules = array(); $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)); if($this->configDirs) {
$modules[basename($path)] = $path; foreach($this->configDirs as $configDir) {
$path = preg_replace('/\/_config$/', '', dirname($configDir));
$modules[basename($path)] = $path;
}
} }
return $modules; return $modules;
} }