From dff6c638eebc28d723c7db1162ea75565bb3c398 Mon Sep 17 00:00:00 2001 From: Hamish Friedlander Date: Fri, 9 Mar 2012 17:20:20 +1300 Subject: [PATCH] ENHANCEMENT: Enable config manifest loading in core --- core/Core.php | 4 ++++ core/manifest/ClassLoader.php | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/Core.php b/core/Core.php index 97afa50db..23e703f1a 100644 --- a/core/Core.php +++ b/core/Core.php @@ -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']) )); diff --git a/core/manifest/ClassLoader.php b/core/manifest/ClassLoader.php index 0009a2ed0..d91f31861 100644 --- a/core/manifest/ClassLoader.php +++ b/core/manifest/ClassLoader.php @@ -50,10 +50,6 @@ class SS_ClassLoader { */ public function pushManifest(SS_ClassManifest $manifest) { $this->manifests[] = $manifest; - - foreach ($manifest->getConfigs() as $config) { - require_once $config; - } } /**