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

fabpot · fabpot · commit baeb1bf671ed · 2018-04-16T16:11:39.000+02:00
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 ------- 99302e7 fix rendering exception stack traces
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig
@@ -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 %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig
@@ -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>
