litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge r.9498 from maint-rel-1.4

Browse source
This commit is contained in:
j2blake 2012-01-11 19:54:29 +00:00
parent 0bb104a4b2
commit 789ebe105a
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
webapp/web/templates/freemarker/body/error/error-email.ftl
View file

@ -25,11 +25,14 @@
</p> </p>
<p> <p>
<strong>Stack trace</strong> (full trace available in the vivo log): ${stackTrace} <strong>Stack trace</strong> (full trace available in the vivo log):
<pre>${stackTrace}</pre>
</p> </p>
<#if cause?has_content> <#if cause?has_content>
<p><strong>Caused by:</strong> ${cause}</p> <p><strong>Caused by:</strong>
<pre>${cause}</pre>
</p>
</#if> </#if>
</body> </body>
@ -43,10 +46,12 @@ Requested url: ${requestedUrl}
Error message: ${errorMessage} Error message: ${errorMessage}
Stack trace (full trace available in the vivo log): ${stackTrace} Stack trace (full trace available in the vivo log):
${stackTrace}
<#if cause?has_content> <#if cause?has_content>
Caused by: ${cause} Caused by:
${cause}
</#if> </#if>
</#assign> </#assign>