Add missing first file/line in exception template

diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index ed962a42384a652b8187929def574f5d4c145f8f..1bfae2a36ef03d33ba62f49e502b9d0d139d3e24 100644 (file)
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -69,9 +69,15 @@ class HTTPException
                        $message = $explanation[$e->getCode()] ?? '';
                }
 
-               $vars = ['$title' => $title, '$message' => $message, '$back' => DI::l10n()->t('Go back')];
+               $vars = [
+                       '$title' => $title,
+                       '$message' => $message,
+                       '$back' => DI::l10n()->t('Go back'),
+                       '$stack_trace' => DI::l10n()->t('Stack trace:'),
+               ];
 
                if (is_site_admin()) {
+                       $vars['$thrown'] = DI::l10n()->t('Exception thrown in %s:%d', $e->getFile(), $e->getLine());
                        $vars['$trace'] = $e->getTraceAsString();
                }
 

diff --git a/view/templates/exception.tpl b/view/templates/exception.tpl
index 04e9f82c024689510632da0c034b68c3d07a150c..4b296614165422114e452bee3ebe002af2044d18 100644 (file)
--- a/view/templates/exception.tpl
+++ b/view/templates/exception.tpl
@@ -2,8 +2,10 @@
     <img class="hare" src="images/friendica-404_svg_flexy-o-hare.png"/>
     <h1>{{$title}}</h1>
     <p>{{$message}}</p>
-{{if $trace}}
-       <pre>{{$trace nofilter}}</pre>
+{{if $thrown}}
+       <pre>{{$thrown}}
+{{$stack_trace}}
+{{$trace}}</pre>
 {{/if}}
        <p><button type="button" onclick="window.history.back()" class="btn btn-primary">{{$back}}</button></p>
 </div>