diff --git a/classes/Tools.php b/classes/Tools.php
index 019e4d353..402e2ec5a 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -633,7 +633,7 @@ class ToolsCore
public static function displayError($string = 'Fatal error', $htmlentities = true, Context $context = null)
{
global $_ERRORS;
-
+
if (is_null($context))
$context = Context::getContext();
@@ -1681,8 +1681,8 @@ FileETag INode MTime Size
trigger_error($message, E_USER_WARNING);
else
{
- 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.');
+ trigger_error('Function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['line'].'
', E_USER_WARNING);
+ $message = 'The function '.$callee['function'].' (Line '.$callee['line'].') is deprecated and will be removed in the next major version.';
}
$class = isset($callee['class']) ? $callee['class'] : null;
Logger::addLog($message, 3, $class);
@@ -1696,9 +1696,10 @@ FileETag INode MTime Size
{
$backtrace = debug_backtrace();
$callee = next($backtrace);
- $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.');
+ $error = 'Parameter '.$parameter.' in function '.$callee['function'].'() is deprecated in '.$callee['file'].' on line '.$callee['Line'].'
';
+ $message = 'The parameter '.$parameter.' in function '.$callee['function'].' (Line '.$callee['Line'].') is deprecated and will be removed in the next major version.';
+ trigger_error($message, E_WARNING);
$class = isset($callee['class']) ? $callee['class'] : null;
self::throwDeprecated($error, $message, $class);
}
@@ -1707,8 +1708,8 @@ FileETag INode MTime Size
{
$backtrace = debug_backtrace();
$callee = current($backtrace);
- $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.');
+ $error = 'File '.$callee['file'].' is deprecated
';
+ $message = 'The file '.$callee['file'].' is deprecated and will be removed in the next major version.';
$class = isset($callee['class']) ? $callee['class'] : null;
self::throwDeprecated($error, $message, $class);