diff --git a/core/includes/errors.inc b/core/includes/errors.inc index 780b8c1..95ea79f 100644 --- a/core/includes/errors.inc +++ b/core/includes/errors.inc @@ -223,7 +223,7 @@ function _drupal_log_error($error, $fatal = FALSE) { $error_message_format .= '
@backtrace
'; } - // We call SafeMarkup::format directly here, rather than use t() since + // We call SafeMarkup::format() directly here, rather than use t() since // we are in the middle of error handling, and we don't want t() to // cause further errors. $message = SafeMarkup::format($error_message_format, $error); diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php index 363c9d1..a3d6fa7 100644 --- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php @@ -121,6 +121,7 @@ protected function onHtml(GetResponseForExceptionEvent $event) { // message, the message doesn't contain argument values, so we output it // once more in the backtrace. array_shift($backtrace); + // Generate a backtrace containing only scalar argument values. $error['@backtrace'] = Error::formatBacktrace($backtrace); $error_message_format .= '
@backtrace
';