aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-06-12 22:06:55 +0200
committerMarc Alexander <admin@m-a-styles.de>2018-06-12 22:06:55 +0200
commit32eb2f427ceb54a200283ab145dbc4e004bee7cc (patch)
tree928284b7cfc91895975c0776e8f83a181e918f6e
parent680361e865af5a574e385de92e86386980204910 (diff)
parentcc4a68f32abcf959b4ddfebba07fdab8264e22db (diff)
downloadforums-32eb2f427ceb54a200283ab145dbc4e004bee7cc.tar
forums-32eb2f427ceb54a200283ab145dbc4e004bee7cc.tar.gz
forums-32eb2f427ceb54a200283ab145dbc4e004bee7cc.tar.bz2
forums-32eb2f427ceb54a200283ab145dbc4e004bee7cc.tar.xz
forums-32eb2f427ceb54a200283ab145dbc4e004bee7cc.zip
Merge pull request #5226 from rubencm/ticket/15504
[ticket/15504] Fix warning message
-rw-r--r--phpBB/phpbb/debug/error_handler.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php
index 246e724f56..ebd828b97f 100644
--- a/phpBB/phpbb/debug/error_handler.php
+++ b/phpBB/phpbb/debug/error_handler.php
@@ -17,7 +17,7 @@ use Symfony\Component\Debug\ErrorHandler;
class error_handler extends ErrorHandler
{
- public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
+ public function handleError($type, $message, $file, $line)
{
if ($type === E_USER_WARNING || $type === E_USER_NOTICE)
{
@@ -26,6 +26,6 @@ class error_handler extends ErrorHandler
$handler($type, $message, $file, $line);
}
- return parent::handleError($type, $message, $file, $line, $context, $backtrace);
+ return parent::handleError($type, $message, $file, $line);
}
}