From ed197d6e346692433c89bb936e839fb77b2a2bb4 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Sat, 23 Jun 2012 14:57:48 -0400
Subject: Issue #1587858 by apotek: Fixed AJAX alert dialogs respect neither
 display_errors ini.php setting or $conf['error_level'] setting, exposing
 server info.

---
 includes/errors.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'includes')

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;
     }
   }
-- 
cgit v1.2.3