Skip to content

Y
yii2
Commit d46ac5b1 by Qiang Xue
Options

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

parents d7a69b60 ba4d9fc2
Showing with 7 additions and 7 deletions
framework/views/exception.php
<?php <?php
/** /**
* @var \Exception $exception * @var \Exception $exception
* @var \yii\base\ErrorHandler $owner * @var \yii\base\ErrorHandler $context
*/ */
$owner = $this->owner; $context = $this->context;
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
...@@ -163,26 +163,26 @@ $owner = $this->owner; ...@@ -163,26 +163,26 @@ $owner = $this->owner;
<h1><?php echo get_class($exception)?></h1> <h1><?php echo get_class($exception)?></h1>
<p class="message"> <p class="message">
<?php echo nl2br($owner->htmlEncode($exception->getMessage()))?> <?php echo nl2br($context->htmlEncode($exception->getMessage()))?>
</p> </p>
<div class="source"> <div class="source">
<p class="file"> <p class="file">
<?php echo $owner->htmlEncode($exception->getFile()) . '(' . $exception->getLine() . ')'?> <?php echo $context->htmlEncode($exception->getFile()) . '(' . $exception->getLine() . ')'?>
</p> </p>
<?php if (YII_DEBUG) $owner->renderSourceCode($exception->getFile(), $exception->getLine(), $owner->maxSourceLines)?> <?php if (YII_DEBUG) $context->renderSourceCode($exception->getFile(), $exception->getLine(), $context->maxSourceLines)?>
</div> </div>
<?php if (YII_DEBUG):?> <?php if (YII_DEBUG):?>
<div class="traces"> <div class="traces">
<h2>Stack Trace</h2> <h2>Stack Trace</h2>
<?php $owner->renderTrace($exception->getTrace())?> <?php $context->renderTrace($exception->getTrace())?>
</div> </div>
<?php endif?> <?php endif?>
<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 ? $owner->versionInfo : ''?> <?php echo YII_DEBUG ? $context->versionInfo : ''?>
</div> </div>
</div> </div>
......
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