php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 14:29:30 +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-03-25 19:39:21 -04:00
parent 27f5c49bd5 5c6966c32e
commit feebb1306f
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/base/Application.php
View File

@@ -479,6 +479,9 @@ class Application extends Module
$msg = (string)$e; $msg = (string)$e;
$msg .= "\nPrevious exception:\n"; $msg .= "\nPrevious exception:\n";
$msg .= (string)$exception; $msg .= (string)$exception;
if (YII_DEBUG) {
echo $msg;
}
$msg .= "\n\$_SERVER = " . var_export($_SERVER, true); $msg .= "\n\$_SERVER = " . var_export($_SERVER, true);
error_log($msg); error_log($msg);
exit(1); exit(1);

8
framework/base/ErrorHandler.php
View File

@@ -78,7 +78,7 @@ 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($this); $view = new View;
if (!YII_DEBUG || $exception instanceof UserException) { if (!YII_DEBUG || $exception instanceof UserException) {
$viewName = $this->errorView; $viewName = $this->errorView;
} else { } else {
@@ -86,7 +86,7 @@ class ErrorHandler extends Component
} }
echo $view->render($viewName, array( echo $view->render($viewName, array(
'exception' => $exception, 'exception' => $exception,
)); ), $this);
} }
} else { } else {
\Yii::$app->renderException($exception); \Yii::$app->renderException($exception);
@@ -255,8 +255,8 @@ class ErrorHandler extends Component
{ {
$view = new View; $view = new View;
$name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView; $name = !YII_DEBUG || $exception instanceof HttpException ? $this->errorView : $this->exceptionView;
echo $view->render($this, $name, array( echo $view->render($name, array(
'exception' => $exception, 'exception' => $exception,
)); ), $this);
} }
} }

2
framework/views/exception.php
View File

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

6
framework/web/Application.php
View File

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