Skip to content

Y
yii2
Commit 2a12fdbc by Alexander Makarov
Options

safer exception rendering

parent c32def86
Showing with 5 additions and 0 deletions
framework/base/ErrorHandler.php
...@@ -81,6 +81,7 @@ class ErrorHandler extends Component ...@@ -81,6 +81,7 @@ class ErrorHandler extends Component
if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') { if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') {
\Yii::$app->renderException($exception); \Yii::$app->renderException($exception);
} else { } else {
try {
$view = new View; $view = new View;
if (!YII_DEBUG || $exception instanceof UserException) { if (!YII_DEBUG || $exception instanceof UserException) {
$viewName = $this->errorView; $viewName = $this->errorView;
...@@ -91,6 +92,10 @@ class ErrorHandler extends Component ...@@ -91,6 +92,10 @@ class ErrorHandler extends Component
'exception' => $exception, 'exception' => $exception,
), $this); ), $this);
} }
catch (\Exception $e) {
\Yii::$app->renderException($e);
}
}
} else { } else {
\Yii::$app->renderException($exception); \Yii::$app->renderException($exception);
} }
......
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