From 94e5ec0545f051c64b0638e9c20fb3332e0c979e Mon Sep 17 00:00:00 2001
From: Thomas Ploch <t.ploch@reizwerk.com>
Date: Sat, 4 Feb 2012 19:27:09 +0100
Subject: [PATCH] Added handling of E_USER_DEPRECATED to ErrorHandler and
 Debugger.

---
 lib/Cake/Error/ErrorHandler.php | 1 +
 lib/Cake/Utility/Debugger.php   | 6 +++++-
 lib/Cake/bootstrap.php          | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Cake/Error/ErrorHandler.php b/lib/Cake/Error/ErrorHandler.php
index 2c2a2ee09..5899a71b4 100644
--- a/lib/Cake/Error/ErrorHandler.php
+++ b/lib/Cake/Error/ErrorHandler.php
@@ -217,6 +217,7 @@ class ErrorHandler {
 				$log = LOG_NOTICE;
 			break;
 			case E_DEPRECATED:
+			case E_USER_DEPRECATED:
 				$error = 'Deprecated';
 				$log = LOG_NOTICE;
 			break;
diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php
index fd7739492..624c60f61 100644
--- a/lib/Cake/Utility/Debugger.php
+++ b/lib/Cake/Utility/Debugger.php
@@ -241,6 +241,11 @@ class Debugger {
 				$error = 'Notice';
 				$level = LOG_NOTICE;
 			break;
+			case E_DEPRECATED:
+			case E_USER_DEPRECATED:
+				$error = 'Deprecated';
+				$level = LOG_NOTICE;
+			break;
 			default:
 				return;
 			break;
@@ -716,5 +721,4 @@ class Debugger {
 			trigger_error(__d('cake_dev', 'Please change the value of \'Security.cipherSeed\' in app/Config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE);
 		}
 	}
-
 }
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index 17f647784..f34b4001e 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -23,6 +23,10 @@ define('TIME_START', microtime(true));
 if (!defined('E_DEPRECATED')) {
 	define('E_DEPRECATED', 8192);
 }
+
+if (!defined('E_USER_DEPRECATED')) {
+	define('E_USER_DEPRECATED', E_USER_NOTICE);
+}
 error_reporting(E_ALL & ~E_DEPRECATED);
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {