1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 00:50:30 +01:00

Merge branch 'prep-release-3.2.3' into 3.2.x

This commit is contained in:
Marc Alexander 2018-06-12 22:10:05 +02:00
commit 94d64c672e
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -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);
}
}