tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.1' into 5

Browse Source
This commit is contained in:
github-actions 2023-11-29 22:52:10 +00:00
commit 809f9e7ae0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/BaseKernel.php
View File

@ -114,10 +114,13 @@ abstract class BaseKernel implements Kernel
$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