Skip to content

Y
yii2
Commit 2a12fdbc by Alexander Makarov
Options

safer exception rendering

parent c32def86
Showing with 13 additions and 8 deletions
framework/base/ErrorHandler.php
...@@ -81,15 +81,20 @@ class ErrorHandler extends Component ...@@ -81,15 +81,20 @@ 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 {
$view = new View; try {
if (!YII_DEBUG || $exception instanceof UserException) { $view = new View;
$viewName = $this->errorView; if (!YII_DEBUG || $exception instanceof UserException) {
} else { $viewName = $this->errorView;
$viewName = $this->exceptionView; } else {
$viewName = $this->exceptionView;
}
echo $view->renderFile($viewName, array(
'exception' => $exception,
), $this);
}
catch (\Exception $e) {
\Yii::$app->renderException($e);
} }
echo $view->renderFile($viewName, array(
'exception' => $exception,
), $this);
} }
} 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