Fix stack trace nav.

Include file/line less frames and use the correct method call type.
cakephp · Dec 5, 2014 · 77624ea · 77624ea
1 parent fd77400
commit 77624ea
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Template/Element/exception_stack_trace_nav.ctp b/src/Template/Element/exception_stack_trace_nav.ctp
@@ -20,15 +20,19 @@ use Cake\Error\Debugger;
 <?php foreach ($error->getTrace() as $i => $stack): ?>
 	<?php $class = (isset($stack['file']) && strpos(APP, $stack['file']) === false) ? 'vendor-frame' : 'app-frame'; ?>
 	<li class="stack-frame <?= $class ?>">
-	<?php if (isset($stack['file']) && isset($stack['line'])): ?>
+	<?php if (isset($stack['function'])): ?>
 		<a href="#" data-target="stack-frame-<?= $i ?>">
-			<?php if (!isset($stack['class'])): ?>
-				<span class="stack-function">&rang; <?= h($stack['function']) ?></span>
+			<?php if (isset($stack['class'])): ?>
+				<span class="stack-function">&rang; <?= h($stack['class'] . $stack['type'] . $stack['function']) ?></span>
 			<?php else: ?>
-				<span class="stack-function">&rang; <?= h($stack['class']) ?>::<?= h($stack['function']) ?></span>
+				<span class="stack-function">&rang; <?= h($stack['function']) ?></span>
 			<?php endif; ?>
 			<span class="stack-file">
+			<?php if (isset($stack['file'], $stack['line'])): ?>
 				<?= h(Debugger::trimPath($stack['file'])) ?>, line <?= $stack['line'] ?>
+			<?php else: ?>
+				[internal function]
+			<?php endif ?>
 			</span>
 		</a>
 	<?php else: ?>