From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 3 Oct 2012 20:51:19 +0000 (-0500)
Subject: Merge branch 'hotfix/recursive404' of https://github.com/rufinus/ZendSkeletonApplicat... 
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=b620dfad6db3f338c4bdaf4d46f4cf71f8b2d9d1;hp=32b1b75990d37064f44cdfbf299bd35574a7eeb0;p=zf2.biz%2Fgalerie.git

Merge branch 'hotfix/recursive404' of https://github.com/rufinus/ZendSkeletonApplication into hotfix/131
---

diff --git a/module/Application/view/error/404.phtml b/module/Application/view/error/404.phtml
index 3edd37a..323733d 100644
--- a/module/Application/view/error/404.phtml
+++ b/module/Application/view/error/404.phtml
@@ -46,16 +46,62 @@ if (isset($this->controller_class)
 
 <?php endif ?>
 
-<?php if (isset($this->exception) && $this->exception): ?>
+<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
 
-<h2><?php echo $this->translate('Exception') ?>:</h2>
+<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
+<hr/>
+<h2><?php echo $this->translate('Additional information') ?>:</h2>
+<h3><?php echo get_class($this->exception); ?></h3>
+<dl>
+    <dt><?php echo $this->translate('File') ?>:</dt>
+    <dd>
+        <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
+    </dd>
+    <dt><?php echo $this->translate('Message') ?>:</dt>
+    <dd>
+        <pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
+    </dd>
+    <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+    <dd>
+        <pre class="prettyprint linenums"><?php echo $this->exception->getTraceAsString() ?></pre>
+    </dd>
+</dl>
+<?php
+    $e = $this->exception->getPrevious();
+    if ($e) :
+?>
+<hr/>
+<h2><?php echo $this->translate('Previous exceptions') ?>:</h2>
+<ul class="unstyled">
+    <?php while($e) : ?>
+    <li>
+        <h3><?php echo get_class($e); ?></h3>
+        <dl>
+            <dt><?php echo $this->translate('File') ?>:</dt>
+            <dd>
+                <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+            </dd>
+            <dt><?php echo $this->translate('Message') ?>:</dt>
+            <dd>
+                <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+            </dd>
+            <dt><?php echo $this->translate('Stack trace') ?>:</dt>
+            <dd>
+                <pre class="prettyprint linenums"><?php echo $e->getTraceAsString() ?></pre>
+            </dd>
+        </dl>
+    </li>
+    <?php
+        $e = $e->getPrevious();
+        endwhile;
+    ?>
+</ul>
+<?php endif; ?>
 
-<p><b><?php echo $this->escapeHtml($this->exception->getMessage()) ?></b></p>
+<?php else: ?>
 
-<h3><?php echo $this->translate('Stack trace') ?>:</h3>
+<h3><?php echo $this->translate('No Exception available') ?></h3>
 
-<pre>
-<?php echo $this->exception->getTraceAsString() ?>
-</pre>
+<?php endif ?>
 
 <?php endif ?>