X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=module%2FApplication%2Fviews%2Ferror%2F404.phtml;h=10e81bb9e04321ef364c931ce5d37f1b3c72ba46;hb=a306ef38e0d2eadf168b44e0ca4810148d2dc126;hp=cf9b4865f5e175393b76f9e8115429c88be22b64;hpb=2d47e39b8075d7bf24397f11a0056afe8c417aa1;p=zf2.biz%2Fgalerie.git

diff --git a/module/Application/views/error/404.phtml b/module/Application/views/error/404.phtml
index cf9b486..10e81bb 100644
--- a/module/Application/views/error/404.phtml
+++ b/module/Application/views/error/404.phtml
@@ -1,14 +1,20 @@
-<h1>An 404 error occurred</h1>
+<h1>A 404 error occurred</h1>
 <h2><?php echo $this->message ?></h2>
 
-<?php if (isset($this->exception)): ?>
+<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
+
+<?php if(isset($this->exception) && $this->exception instanceof Exception): ?>
 
 <h3>Exception information:</h3>
 <p>
-    <b>Message:</b> <?php echo $this->exception->getMessage() ?>
+    <h4>Stack trace:</h4>
+    <pre><?php echo $this->exception->getTraceAsString() ?></pre>
 </p>
 
-<h3>Stack trace:</h3>
-<pre><?php echo $this->exception->getTraceAsString() ?></pre>
+<?php else: ?>
+
+<h3>No Exception available</h3>
 
 <?php endif ?>
+
+<?php endif ?>
\ No newline at end of file