fix bug #151: HTML entities in titles are encoded twice

diff --git a/tpl/home.twig b/tpl/home.twig
index 03f9f70da513d1be93380220788423c8e329a75d..58586d7a1151021ade5e34c3691453658727a71c 100644 (file)
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -13,7 +13,7 @@
             {{ page_links | raw }}
             {% for entry in entries %}
             <div id="entry-{{ entry.id|e }}" class="entrie">
-                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|e }}</a></h2>
+                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                 <ul class="tools">
                     <li>
                         <a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span></span></a></li>

diff --git a/tpl/view.twig b/tpl/view.twig
index ba0aae3031b593e197b2035a9942df5fa5b5d4cd..0456471ef5f80a925fc76057f74eeae411ebf0f9 100644 (file)
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -16,7 +16,7 @@
                 </ul>
             </div>
             <header class="mbm">
-                <h1>{{ entry.title|e }}</h1>
+                <h1>{{ entry.title|raw }}</h1>
                 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div>
             </header>
             <article>