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

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

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

framework/views/exception.php

@@ -183,7 +183,7 @@ $title = $context->htmlEncode($exception instanceof \yii\base\Exception || $exce
 
 	<div class="version">
 		<?php echo date('Y-m-d H:i:s', time())?>
-		<?php echo YII_DEBUG ? $context->versionInfo : ''?>
+		<?php echo YII_DEBUG ? $context->getVersionInfo() : ''?>
 	</div>
 </div>
 

framework/web/Application.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\web;
+
 use yii\base\InvalidParamException;
 
 /**
@@ -16,6 +17,11 @@ use yii\base\InvalidParamException;
  */
 class Application extends \yii\base\Application
 {
+	/**
+	 * @var string the default route of this application. Defaults to 'site'.
+	 */
+	public $defaultRoute = 'site';
+
 	/**
 	 * Sets default path aliases.
 	 */