Commit 9061874b by Ilya Antipenko Committed by Alexander Makarov

Fixes #5646: Call `yii\base\ErrorHandler::unregister()` instead of `restore_*_handlers` directly

parent 7ec08fc8
...@@ -9,6 +9,7 @@ Yii Framework 2 Change Log ...@@ -9,6 +9,7 @@ Yii Framework 2 Change Log
- Bug: Gii console command help information does not contain global options (qiangxue) - Bug: Gii console command help information does not contain global options (qiangxue)
- Enh #5600: Allow configuring debug panels in `yii\debug\Module::panels` as panel class name strings (qiangxue) - Enh #5600: Allow configuring debug panels in `yii\debug\Module::panels` as panel class name strings (qiangxue)
- Enh #5613: Added `--overwrite` option to Gii console command to support overwriting all files (motin, qiangxue) - Enh #5613: Added `--overwrite` option to Gii console command to support overwriting all files (motin, qiangxue)
- Enh #5646: Call `yii\base\ErrorHandler::unregister()` instead of `restore_*_handlers` directly (aivus)
2.0.0 October 12, 2014 2.0.0 October 12, 2014
......
...@@ -85,8 +85,8 @@ abstract class ErrorHandler extends Component ...@@ -85,8 +85,8 @@ abstract class ErrorHandler extends Component
$this->exception = $exception; $this->exception = $exception;
// disable error capturing to avoid recursive errors while handling exceptions // disable error capturing to avoid recursive errors while handling exceptions
restore_error_handler(); $this->unregister();
restore_exception_handler();
try { try {
$this->logException($exception); $this->logException($exception);
if ($this->discardExistingOutput) { if ($this->discardExistingOutput) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment