diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-01-19 21:13:09 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-01-19 21:13:09 +0000 |
commit | 79b740acc1ad13a422e4af286da60420b6bb8892 (patch) | |
tree | e4366a7a843446756a189a61b5ba801f50db5f0d /includes | |
parent | b2402f40ae19ad5b4da08d29e39c8cda93ef4d3a (diff) | |
download | brdo-79b740acc1ad13a422e4af286da60420b6bb8892.tar.gz brdo-79b740acc1ad13a422e4af286da60420b6bb8892.tar.bz2 |
- Patch #291026 by Dave Reid, Pasqualle, Rob Loach, et al: improved error reporting settings.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/common.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 91bed1d05..c2a22c899 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -797,8 +797,10 @@ function _drupal_log_error($error, $fatal = FALSE) { $number++; } - // Force display of error messages in update.php. - if (variable_get('error_level', 1) == 1 || (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'update')) { + // Force display of error messages in update.php or if the proper error + // reporting level is set. + $error_level = variable_get('error_level', 2); + if ($error_level == 2 || ($error_level == 1 && $type != 'Notice') || (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'update')) { drupal_set_message(t('%type: %message in %function (line %line of %file).', $error), 'error'); } |