diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 6aab188..12f4f91 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -345,8 +345,6 @@ function install_begin_request(&$install_state) { ->addArgument(new Reference('config.factory')); } - $install_state['settings_verified'] = $install_state['config_verified'] && $install_state['database_verified']; - if ($install_state['settings_verified']) { try { $system_schema = system_schema(); @@ -380,10 +378,6 @@ function install_begin_request(&$install_state) { $container = $kernel->getContainer(); $container->get('request_stack')->push($request); - - - - // Register the file translation service. if (isset($GLOBALS['config']['locale.settings']['translation']['path'])) { $directory = $GLOBALS['config']['locale.settings']['translation']['path']; @@ -700,8 +694,6 @@ function install_tasks($install_state) { ), 'install_database_ready' => array( 'run' => $install_state['database_ready'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, - //'function' => install_database_ready(), - ), 'install_base_system' => array( 'run' => $install_state['base_system_verified'] ? INSTALL_TASK_SKIP : INSTALL_TASK_RUN_IF_NOT_COMPLETED, @@ -1039,7 +1031,6 @@ function install_verify_completed_task() { * Verifies that settings.php specifies a valid database connection. */ function install_verify_database_settings() { - if ($database = Database::getConnectionInfo()) { $database = $database['default']; $settings_file = './' . conf_path(FALSE) . '/settings.php';