Merge branch '5.1' into 5

silverstripe · Nov 29, 2023 · 809f9e7 · 809f9e7
2 parents 654b793 + eb245a1
commit 809f9e7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
@@ -114,10 +114,13 @@ public function __construct($basePath)
         $this->setModuleLoader($moduleLoader);
 
         // Config loader
-        $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