From 496b3b8cd70b4663bc61f794341d49a0a7eb8473 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 7 Dec 2009 08:46:59 +0000
Subject: #524664 by codecowboy and mfb: drupal_error_handler() does not
 support PHP 5.3.0 error constants.

---
 includes/common.inc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'includes')

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