diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 3999741..6d4da71 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -373,20 +373,12 @@ function install_begin_request($class_loader, &$install_state) { ->addArgument(new Reference('config.factory')); } + // $install_state['base_system_verified'] defaults to FALSE, so the code + // following below will use the minimal installer service container. + // As soon as the base system is verified here, the installer operates in + // a full and regular Drupal environment, without any kind of exceptions. if ($install_state['settings_verified']) { - try { - $system_schema = system_schema(); - end($system_schema); - $table = key($system_schema); - $install_state['base_system_verified'] = Database::getConnection()->schema()->tableExists($table); - } - catch (DatabaseExceptionWrapper $e) { - // The last defined table of the base system_schema() does not exist yet. - // $install_state['base_system_verified'] defaults to FALSE, so the code - // following below will use the minimal installer service container. - // As soon as the base system is verified here, the installer operates in - // a full and regular Drupal environment, without any kind of exceptions. - } + $install_state['base_system_verified'] = drupal_is_installed(); } // Replace services with in-memory and null implementations. This kernel is