Skip to content

Y
yii2
Commit 4e8f9cea by Qiang Xue
Options

Merge branch 'master' of git.yiisoft.com:yii2

parents 30e6d28b 0a41b006
Showing with 2 additions and 4 deletions
framework/base/ErrorHandler.php
...@@ -81,6 +81,8 @@ class ErrorHandler extends Component ...@@ -81,6 +81,8 @@ 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 {
// if there is an error during error rendering it's useful to
// display PHP error in debug mode instead of a blank screen
if(YII_DEBUG) { if(YII_DEBUG) {
ini_set('display_errors', 1); ini_set('display_errors', 1);
} }
...@@ -94,10 +96,6 @@ class ErrorHandler extends Component ...@@ -94,10 +96,6 @@ class ErrorHandler extends Component
echo $view->renderFile($viewName, array( echo $view->renderFile($viewName, array(
'exception' => $exception, 'exception' => $exception,
), $this); ), $this);
if(YII_DEBUG) {
ini_set('display_errors', 0);
}
} }
} 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