diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-06-12 22:10:05 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-06-12 22:10:05 +0200 |
| commit | 94d64c672e72e5855e8596ca58624fbbe3e64787 (patch) | |
| tree | 928284b7cfc91895975c0776e8f83a181e918f6e | |
| parent | b5a79d9a9d587c5af6b2d71e5a22c08d1fd3735b (diff) | |
| parent | 32eb2f427ceb54a200283ab145dbc4e004bee7cc (diff) | |
| download | forums-94d64c672e72e5855e8596ca58624fbbe3e64787.tar forums-94d64c672e72e5855e8596ca58624fbbe3e64787.tar.gz forums-94d64c672e72e5855e8596ca58624fbbe3e64787.tar.bz2 forums-94d64c672e72e5855e8596ca58624fbbe3e64787.tar.xz forums-94d64c672e72e5855e8596ca58624fbbe3e64787.zip | |
Merge branch 'prep-release-3.2.3' into 3.2.x
| -rw-r--r-- | phpBB/phpbb/debug/error_handler.php | 4 |
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); } } |