bug #26922 [TwigBundle] fix rendering exception stack traces (xabbuh)

This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBundle] fix rendering exception stack traces

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

99302e72fc fix rendering exception stack traces
This commit is contained in:
Fabien Potencier 2018-04-16 16:11:39 +02:00
commit baeb1bf671
2 changed files with 7 additions and 3 deletions

View File

@ -1,5 +1,4 @@
{% if exception.trace|length %}
<pre class="stacktrace">
{{ exception.class }}:
{% if exception.message is not empty %}
{{- exception.message }}
@ -8,5 +7,4 @@
{% for trace in exception.trace %}
{{ include('@Twig/Exception/trace.txt.twig', { trace: trace }, with_context = false) }}
{% endfor %}
</pre>
{% endif %}

View File

@ -17,7 +17,13 @@
<tbody id="trace-text-{{ index }}">
<tr>
<td>
{{ include('@Twig/Exception/traces.txt.twig', { exception: exception }, with_context = false) }}
{% if exception.trace|length %}
<pre class="stacktrace">
{%- filter escape('html') -%}
{{- include('@Twig/Exception/traces.txt.twig', { exception: exception, format: 'html' }, with_context = false) }}
{% endfilter %}
</pre>
{% endif %}
</td>
</tr>
</tbody>