makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-06-12 22:11:06 +02:00
commit 3b69b3aa32
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/debug/error_handler.php
View file

@ -17,7 +17,7 @@ use Symfony\Component\Debug\ErrorHandler;
class error_handler extends 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) if ($type === E_USER_WARNING || $type === E_USER_NOTICE)
{ {
@ -26,6 +26,6 @@ class error_handler extends ErrorHandler
$handler($type, $message, $file, $line); $handler($type, $message, $file, $line);
} }
return parent::handleError($type, $message, $file, $line, $context, $backtrace); return parent::handleError($type, $message, $file, $line);
} }
} }