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

Merge branch '4' into 5.1

Browse Source
This commit is contained in:
Guy Sartorelli 2023-11-30 11:51:36 +13:00
commit eb245a1f83
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/BaseKernel.php
View File

@ -114,10 +114,13 @@ abstract class BaseKernel implements Kernel
$this->setModuleLoader($moduleLoader); $this->setModuleLoader($moduleLoader);
// Config loader // Config loader
$configLoader = ConfigLoader::inst();
// If nesting kernels, don't create a new config manifest as that will reset config deltas
if (!$configLoader->hasManifest()) {
$configFactory = new CoreConfigFactory($manifestCacheFactory); $configFactory = new CoreConfigFactory($manifestCacheFactory);
$configManifest = $configFactory->createRoot(); $configManifest = $configFactory->createRoot();
$configLoader = ConfigLoader::inst();
$configLoader->pushManifest($configManifest); $configLoader->pushManifest($configManifest);
}
$this->setConfigLoader($configLoader); $this->setConfigLoader($configLoader);
// Load template manifest // Load template manifest