From ac086862ef09eb2fb9f04a6e10cbafc3aa807dc3 Mon Sep 17 00:00:00 2001 From: tDidierjean Date: Thu, 17 Nov 2011 15:49:40 +0000 Subject: [PATCH] [-] Classes : fixed bug with displayAsDeprecated functions when not called from a class --- classes/Tools.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/classes/Tools.php b/classes/Tools.php index bd0cb0675..987fa01b9 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -1588,8 +1588,8 @@ FileETag INode MTime Size trigger_error('Function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['line'].'
', E_USER_WARNING); $message = self::displayError('The function').' '.$callee['function'].' ('.self::displayError('Line').' '.$callee['line'].') '.self::displayError('is deprecated and will be removed in the next major version.'); } - - Logger::addLog($message, 3, $callee['class']); + $class = isset($callee['class']) ? $callee['class'] : null; + Logger::addLog($message, 3, $class); } } @@ -1603,7 +1603,8 @@ FileETag INode MTime Size $error = 'Parameter '.$parameter.' in function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['Line'].'
'; $message = self::displayError('The parameter').' '.$parameter.' '.self::displayError(' in function ').' '.$callee['function'].' ('.self::displayError('Line').' '.$callee['Line'].') '.self::displayError('is deprecated and will be removed in the next major version.'); - self::throwDeprecated($error, $message, $callee['class']); + $class = isset($callee['class']) ? $callee['class'] : null; + self::throwDeprecated($error, $message, $class); } public static function displayFileAsDeprecated() @@ -1613,7 +1614,8 @@ FileETag INode MTime Size $error = 'File '.$callee['file'].' is deprecated
'; $message = Tools::displayError('The file').' '.$callee['file'].' '.Tools::displayError('is deprecated and will be removed in the next major version.'); - self::throwDeprecated($error, $message, $callee['class']); + $class = isset($callee['class']) ? $callee['class'] : null; + self::throwDeprecated($error, $message, $class); } protected static function throwDeprecated($error, $message, $class)