diff -u b/core/includes/install.core.inc b/core/includes/install.core.inc --- b/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -7,7 +7,6 @@ use Drupal\Component\Utility\UrlHelper; use Drupal\Core\DrupalKernel; -use Drupal\Core\Config\BootstrapConfigStorageFactory; use Drupal\Core\Database\Database; use Drupal\Core\Database\DatabaseExceptionWrapper; use Drupal\Core\Form\FormState; @@ -489,13 +488,7 @@ // Ensure that the active configuration is empty before installation starts. if ($install_state['config_verified'] && empty($task)) { - try { - $config = BootstrapConfigStorageFactory::get()->listAll(); - } - catch (\Exception $e) { - // If this fails assume there is no active configuration. - } - if (!empty($config)) { + if (count($kernel->getConfigStorage()->listAll())) { $task = NULL; throw new AlreadyInstalledException($container->get('string_translation')); } only in patch2: unchanged: --- a/core/lib/Drupal/Core/Installer/InstallerKernel.php +++ b/core/lib/Drupal/Core/Installer/InstallerKernel.php @@ -33,4 +33,14 @@ public function resetConfigStorage() { $this->configStorage = NULL; } + /** + * Returns the active configuration storage used during early install. + * + * @return \Drupal\Core\Config\StorageInterface + * The config storage. + */ + public function getConfigStorage() { + return parent::getConfigStorage(); + } + }