Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue by mbrett5062: Improved error message.

8.0.x
Dries 2012-10-22 16:55:11 -04:00
parent 0471b498f5
commit 35b78b8cb2
2 changed files with 2 additions and 2 deletions
core
includes
lib/Drupal/Core

2
core/includes/errors.inc
View File

@ -273,7 +273,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.
$output = theme('maintenance_page', array('content' => 'The website encountered an unexpected error. Please try again later.'));
$output = theme('maintenance_page', array('content' => 'The website has encountered an error. Please try again later.'));
$response = new Response($output, 500);
if ($fatal) {

2
core/lib/Drupal/Core/ExceptionController.php
View File

@ -266,7 +266,7 @@ class ExceptionController extends ContainerAware {
drupal_set_title(t('Error'));
// We fallback to a maintenance page at this point, because the page
// generation itself can generate errors.
$output = theme('maintenance_page', array('content' => t('The website encountered an unexpected error. Please try again later.')));
$output = theme('maintenance_page', array('content' => t('The website has encountered an error. Please try again later.')));
$response = new Response($output, 500);
$response->setStatusCode(500, '500 Service unavailable (with message)');