diff --git a/core/lib/Drupal/Core/Database/Install/Tasks.php b/core/lib/Drupal/Core/Database/Install/Tasks.php index 8036322..fea4bd9 100644 --- a/core/lib/Drupal/Core/Database/Install/Tasks.php +++ b/core/lib/Drupal/Core/Database/Install/Tasks.php @@ -148,14 +148,13 @@ public function runTasks() { } } // Check for failed results and compile message - $message = ''; foreach ($this->results as $result => $success) { if (!$success) { - $message = SafeMarkup::isSafe($result) ? $result : SafeMarkup::checkPlain($result); + $failure_message = $result; } } - if (!empty($message)) { - $message = SafeMarkup::set('Resolve all issues below to continue the installation. For help configuring your database server, see the installation handbook, or contact your hosting provider.' . $message); + if (!empty($failure_message)) { + $message = SafeMarkup::format('Resolve all issues below to continue the installation. For help configuring your database server, see the installation handbook, or contact your hosting provider.@failure_message', ['@failure_message' => $failure_message]); throw new TaskException($message); } }