summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-12-07 08:46:59 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-12-07 08:46:59 +0000
commit496b3b8cd70b4663bc61f794341d49a0a7eb8473 (patch)
tree5ff5154dde43dc9b68f139814d450162ccca89cf
parent271fbd6bd317ccafe574fd3d5cac4b4b3e9190bf (diff)
downloadbrdo-496b3b8cd70b4663bc61f794341d49a0a7eb8473.tar.gz
brdo-496b3b8cd70b4663bc61f794341d49a0a7eb8473.tar.bz2
#524664 by codecowboy and mfb: drupal_error_handler() does not support PHP 5.3.0 error constants.
-rw-r--r--includes/common.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/common.inc b/includes/common.inc
index 876e3ae3f..613596ffa 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1067,6 +1067,11 @@ function _drupal_error_handler($error_level, $message, $filename, $line, $contex
E_STRICT => 'Strict warning',
E_RECOVERABLE_ERROR => 'Recoverable fatal error'
);
+ // E_DEPRECATED and E_USER_DEPRECATED were added in PHP 5.3.0.
+ if (defined('E_DEPRECATED')) {
+ $types[E_DEPRECATED] = 'Deprecated function';
+ $types[E_USER_DEPRECATED] = 'User deprecated function';
+ }
$caller = _drupal_get_last_caller(debug_backtrace());
// We treat recoverable errors as fatal.