dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Classes : fixed bug with displayAsDeprecated functions when not called from a class

Browse Source
This commit is contained in:
tDidierjean
2011-11-17 15:49:40 +00:00
parent e8d12e1f6f
commit ac086862ef
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+6 -4
View File
@@ -1588,8 +1588,8 @@ FileETag INode MTime Size
trigger_error('Function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['line'].'</strong><br />', E_USER_WARNING); trigger_error('Function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['line'].'</strong><br />', 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.'); $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.');
} }
$class = isset($callee['class']) ? $callee['class'] : null;
Logger::addLog($message, 3, $callee['class']); Logger::addLog($message, 3, $class);
} }
} }
@@ -1603,7 +1603,8 @@ FileETag INode MTime Size
$error = 'Parameter <strong>'.$parameter.'</strong> in function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['Line'].'</strong><br />'; $error = 'Parameter <strong>'.$parameter.'</strong> in function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['Line'].'</strong><br />';
$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.'); $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() public static function displayFileAsDeprecated()
@@ -1613,7 +1614,8 @@ FileETag INode MTime Size
$error = 'File <strong>'.$callee['file'].'</strong> is deprecated<br />'; $error = 'File <strong>'.$callee['file'].'</strong> is deprecated<br />';
$message = Tools::displayError('The file').' '.$callee['file'].' '.Tools::displayError('is deprecated and will be removed in the next major version.'); $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) protected static function throwDeprecated($error, $message, $class)