From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 3 Feb 2016 19:45:15 +0000 (+0100)
Subject: Unescape content for Material card
X-Git-Tag: 2.0.0-beta.1~55^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0796532460b90cb3ef7ecbf86db6d0adc07c88b4;p=github%2Fwallabag%2Fwallabag.git

Unescape content for Material card

Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&amp;`.
Using |raw, the content isn't escape twice and is well displayed.
---

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 6de800b9..0c35de2d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -46,16 +46,17 @@
                                 <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i>
                             {% endif %}
 
-                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw|striptags|slice(0, 42) }}</a></span>
+                            <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
 
-                            {% if entry.readingTime > 0 %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div>
-                            {% else %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur">&lt;</small> 1 min</span></div>
-                            {% endif %}
+                            <div class="estimatedTime grey-text">
+                                <span class="tool reading-time">
+                                    {% trans %}estimated reading time{% endtrans %}:
+                                    {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min
+                                </span>
+                            </div>
 
                             {% if entry.previewPicture is null %}
-                                <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                                <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
                             {% endif %}
                         </div>
                     </div>
@@ -65,13 +66,14 @@
                             <i class="card-title grey-text text-darken-4 mdi-card-close right"></i>
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
 
-                            {% if entry.readingTime > 0 %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min</span></div>
-                            {% else %}
-                                <div class="estimatedTime grey-text"><span class="tool reading-time">{% trans %}estimated reading time{% endtrans %}: <small class="inferieur">&lt;</small> 1 min</span></div>
-                            {% endif %}
+                            <div class="estimatedTime grey-text">
+                                <span class="tool reading-time">
+                                    {% trans %}estimated reading time{% endtrans %}:
+                                    {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min
+                                </span>
+                            </div>
 
-                            <p>{{ entry.content|striptags|slice(0, 300) }}&hellip;</p>
+                            <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
                         </div>
                     {% endif %}