geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-09-11 02:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of fatal errors in template

Browse Source
This commit is contained in:
filp
2013-03-13 23:29:03 +00:00
parent ba194c7991
commit 1fee57328a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Damnit/Resources/pretty-template.php
+8 -8
View File
@@ -282,7 +282,7 @@
<?php foreach($v->frames as $i => $frame): ?>
<div class="frame <?php echo ($i == 0 ? 'active' : '') ?>" id="frame-line-<?php echo $i ?>">
<span class="frame-file">
<?php echo $e($frame->getFile()) ?><!-- get rid of ugly whitespace
<?php echo $e($frame->getFile() ?: '<#unknown>') ?><!-- get rid of ugly whitespace
--><span class="frame-line"><?php echo (int) $frame->getLine() ?></span>
</span>
</div>
@@ -297,21 +297,22 @@
* we get 200 frames to process. */ ?>
<div class="frame-code-container <?php echo (!$v->hasFrames ? 'empty' : '') ?>">
<?php foreach($v->frames as $i => $frame): ?>
<?php $line = $frame->getLine(); ?>
<?php if($line !== null): ?>
<div class="frame-code <?php echo ($i == 0 ) ? 'active' : '' ?>" id="frame-code-<?php echo $i ?>">
<div class="frame-file">
<strong><?php echo $e($frame->getFile() ?: '<#unknown>') ?></strong>
</div>
<?php
// Do nothing if there's no line to work off
if($line !== null):
// the $line is 1-indexed, we nab -1 where needed to account for this
$range = $frame->getFileLines($line - 3, 4);
$start = key($range) + 1;
$code = join("\n", $range);
?>
<div class="frame-file">
<strong><?php echo $e($frame->getFile()) ?></strong>
</div>
<pre class="code-block prettyprint linenums:<?php echo $start ?>"><?php echo $e($code) ?></pre>
<?php endif ?>
<?php
/* Append comments for this frame */
@@ -328,7 +329,6 @@
</div>
</div>
<?php endif ?>
<?php endforeach ?>
</div>