diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index 0160119..3e48b75 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -520,6 +520,8 @@ protected function buildContainer() { $container->register('class_loader')->setSynthetic(TRUE); $container->register('kernel', 'Symfony\Component\HttpKernel\KernelInterface')->setSynthetic(TRUE); $container->register('service_container', 'Symfony\Component\DependencyInjection\ContainerInterface')->setSynthetic(TRUE); + // Register the kernel-level config storage. + $container->set('kernel.config.storage', $this->configStorage); $yaml_loader = new YamlFileLoader($container); foreach ($this->serviceYamls as $filename) { $yaml_loader->load($filename); diff --git a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php index 4f2681e..f4feb1d 100644 --- a/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php +++ b/core/modules/language/lib/Drupal/language/LanguageServiceProvider.php @@ -70,7 +70,7 @@ public function alter(ContainerBuilder $container) { */ protected function isMultilingual(ContainerBuilder $container) { $prefix = 'language.entity'; - $language_ids = array_filter($container->get('config.storage')->listAll($prefix), function($language_id) use ($prefix) { + $language_ids = array_filter($container->get('kernel.config.storage')->listAll($prefix), function($language_id) use ($prefix) { return $language_id != $prefix . '.' . Language::LANGCODE_NOT_SPECIFIED && $language_id != $prefix . '.' . Language::LANGCODE_NOT_APPLICABLE; }); return count($language_ids) > 1;