php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 22:12:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Qiang Xue
2013-04-18 23:23:10 -04:00
parent 30e6d28b77 0a41b006ee
commit 4e8f9ceaa7
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/base/ErrorHandler.php
View File

@ -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
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);