Commit b58943a0 authored by xjm's avatar xjm

Issue #1818692 by mbrett5062, lokapujya, David_Rothstein, blacklight4: Improve...

Issue #1818692 by mbrett5062, lokapujya, David_Rothstein, blacklight4: Improve the maintenance page error message (rollback)
parent 8cb29f9e
...@@ -233,7 +233,7 @@ function _drupal_log_error($error, $fatal = FALSE) { ...@@ -233,7 +233,7 @@ function _drupal_log_error($error, $fatal = FALSE) {
// We fallback to a maintenance page at this point, because the page generation // We fallback to a maintenance page at this point, because the page generation
// itself can generate errors. // itself can generate errors.
// Should not translate the string to avoid errors producing more 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) { if ($is_installer) {
// install_display_output() prints the output and ends script execution. // install_display_output() prints the output and ends script execution.
$output = array( $output = array(
......
...@@ -128,7 +128,7 @@ protected function onHtml(GetResponseForExceptionEvent $event) { ...@@ -128,7 +128,7 @@ protected function onHtml(GetResponseForExceptionEvent $event) {
drupal_set_message(SafeMarkup::set($message), $class, TRUE); 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'); $output = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Error'), 'maintenance_page');
$response = new Response($output); $response = new Response($output);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment