From b58943a0deb481615cfd3e873669ed3f7e1afba4 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Sun, 24 May 2015 13:06:20 -0500
Subject: [PATCH] Issue #1818692 by mbrett5062, lokapujya, David_Rothstein,
blacklight4: Improve the maintenance page error message (rollback)
---
core/includes/errors.inc | 2 +-
.../Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index fa3bc6baa969..5e38a973cca8 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -233,7 +233,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
// We fallback to a maintenance page at this point, because the page generation
// itself can generate errors.
// Should not translate the string to avoid errors producing more errors.
- $message = 'The website has encountered an error. Please try again later.';
+ $message = 'The website encountered an unexpected error. Please try again later.';
if ($is_installer) {
// install_display_output() prints the output and ends script execution.
$output = array(
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
index e0a1343d24f8..7e87f4cbea2f 100644
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
@@ -128,7 +128,7 @@ protected function onHtml(GetResponseForExceptionEvent $event) {
drupal_set_message(SafeMarkup::set($message), $class, TRUE);
}
- $content = $this->t('The website has encountered an error. Please try again later.');
+ $content = $this->t('The website encountered an unexpected error. Please try again later.');
$output = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Error'), 'maintenance_page');
$response = new Response($output);
--
GitLab