commit 9253978e29126ec3a2b5f70f980afd200ed2a63d Author: Joel Pittet Date: Tue Aug 4 11:26:25 2015 -0700 bit shorter diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php index 4e6e2fc..409c859 100644 --- a/core/lib/Drupal/Core/Database/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Install/Tasks.php @@ -148,25 +148,19 @@ public function runTasks() { } } // Check for failed results and compile message - $failure = FALSE; - $error = []; + $errors = []; foreach ($this->results as $result => $success) { if (!$success) { - $failure = TRUE; - $error[] = $result; + $errors[] = $result; } } - if ($failure) { - $message = array( - 'error' => array( - '#markup' => t('Resolve all issues below to continue the installation. For help configuring your database server, see the installation handbook, or contact your hosting provider.'), - ), - 'item_list' => array( - '#theme' => 'item_list', - '#items' => $error, - ), - ); - $message = \Drupal::service('renderer')->renderPlain(($message), 'error'); + if ($errors) { + $error_list = [ + '#theme' => 'item_list', + '#items' => $errors, + ]; + $error_list = \Drupal::service('renderer')->renderPlain($error_list); + $message = t('Resolve all issues below to continue the installation. For help configuring your database server, see the installation handbook, or contact your hosting provider.@errors', ['@errors' => $error_list]); throw new TaskException($message); } }