Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ENHANCEMENT: Enable config manifest loading in core

  • Loading branch information...
commit dff6c638eebc28d723c7db1162ea75565bb3c398 1 parent 5ff095e
@hafriedlander hafriedlander authored
Showing with 4 additions and 4 deletions.
  1. +4 −0 core/Core.php
  2. +0 −4 core/manifest/ClassLoader.php
View
4 core/Core.php
@@ -258,6 +258,10 @@ function array_fill_keys($keys,$value) {
$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'])
));
View
4 core/manifest/ClassLoader.php
@@ -50,10 +50,6 @@ public function hasManifest() {
*/
public function pushManifest(SS_ClassManifest $manifest) {
$this->manifests[] = $manifest;
-
- foreach ($manifest->getConfigs() as $config) {
- require_once $config;
- }
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.