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

ENHANCEMENT: Enable config manifest loading in core

Browse Source
This commit is contained in:
Hamish Friedlander 2012-03-09 17:20:20 +13:00
parent 5ff095e561
commit dff6c638ee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Core.php
View File

@ -258,6 +258,10 @@ $loader = SS_ClassLoader::instance();
$loader->registerAutoloader();
$loader->pushManifest($manifest);
// Now that the class manifest is up, load the configuration
$configManifest = new SS_ConfigManifest(BASE_PATH, false, $flush);
Config::inst()->pushConfigManifest($configManifest);
SS_TemplateLoader::instance()->pushManifest(new SS_TemplateManifest(
BASE_PATH, false, isset($_GET['flush'])
));

4
core/manifest/ClassLoader.php
View File

@ -50,10 +50,6 @@ class SS_ClassLoader {
*/
public function pushManifest(SS_ClassManifest $manifest) {
$this->manifests[] = $manifest;
foreach ($manifest->getConfigs() as $config) {
require_once $config;
}
}
/**