FIX Don't replace config manifest for nested kernels (#11082)

silverstripe · Nov 29, 2023 · 6d90384 · 6d90384
1 parent 1d69236
commit 6d90384
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
@@ -115,11 +115,13 @@ public function __construct($basePath)
         $this->setModuleLoader($moduleLoader);
 
         // Config loader
-        // @todo refactor CoreConfigFactory
-        $configFactory = new CoreConfigFactory($manifestCacheFactory);
-        $configManifest = $configFactory->createRoot();
         $configLoader = ConfigLoader::inst();
-        $configLoader->pushManifest($configManifest);
+        // If nesting kernels, don't create a new config manifest as that will reset config deltas
+        if (!$configLoader->hasManifest()) {
+            $configFactory = new CoreConfigFactory($manifestCacheFactory);
+            $configManifest = $configFactory->createRoot();
+            $configLoader->pushManifest($configManifest);
+        }
         $this->setConfigLoader($configLoader);
 
         // Load template manifest