mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
FIX Don't replace config manifest for nested kernels (#11082)
This commit is contained in:
parent
1d69236229
commit
6d903848ab
@ -115,11 +115,13 @@ abstract class BaseKernel implements Kernel
|
||||
$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
|
||||
|
Loading…
Reference in New Issue
Block a user