diff --git a/framework/base/Application.php b/framework/base/Application.php index 31087e2..fd2ecad 100644 --- a/framework/base/Application.php +++ b/framework/base/Application.php @@ -479,6 +479,9 @@ class Application extends Module $msg = (string)$e; $msg .= "\nPrevious exception:\n"; $msg .= (string)$exception; + if (YII_DEBUG) { + echo $msg; + } $msg .= "\n\$_SERVER = " . var_export($_SERVER, true); error_log($msg); exit(1); diff --git a/framework/base/ErrorHandler.php b/framework/base/ErrorHandler.php index a3ab137..f71b8c8 100644 --- a/framework/base/ErrorHandler.php +++ b/framework/base/ErrorHandler.php @@ -78,7 +78,7 @@ class ErrorHandler extends Component if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest') { \Yii::$app->renderException($exception); } else { - $view = new View($this); + $view = new View; if (!YII_DEBUG || $exception instanceof UserException) { $viewName = $this->errorView; } else { @@ -86,7 +86,7 @@ class ErrorHandler extends Component } echo $view->render($viewName, array( 'exception' => $exception, - )); + ), $this); } } else { \Yii::$app->renderException($exception); @@ -255,8 +255,8 @@ class ErrorHandler extends Component { $view = new View; $name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView; - echo $view->render($this, $name, array( + echo $view->render($name, array( 'exception' => $exception, - )); + ), $this); } } diff --git a/framework/views/exception.php b/framework/views/exception.php index 6257ffe..db29302 100644 --- a/framework/views/exception.php +++ b/framework/views/exception.php @@ -183,7 +183,7 @@ $title = $context->htmlEncode($exception instanceof \yii\base\Exception || $exce