diff options
| -rw-r--r-- | CHANGELOG.txt | 1 | ||||
| -rw-r--r-- | includes/errors.inc | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a3db7755e..db4a8341d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,7 @@ Drupal 7.15, xxxx-xx-xx (development version) correctly. - Fixed bug: Language detection by domain only worked on port 80. - Fixed bug which prevented image styles from being deleted on PHP 5.4. +- Made Ajax alert dialogs respect error reporting settings. Drupal 7.14 2012-05-02 ---------------------- diff --git a/includes/errors.inc b/includes/errors.inc index f62bf06a5..9d0df0544 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -230,8 +230,10 @@ function _drupal_log_error($error, $fatal = FALSE) { if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') { if ($fatal) { - // When called from JavaScript, simply output the error message. - print t('%type: !message in %function (line %line of %file).', $error); + if (error_displayable($error)) { + // When called from JavaScript, simply output the error message. + print t('%type: !message in %function (line %line of %file).', $error); + } exit; } } |