From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Fri, 23 Aug 2013 19:06:45 +0000 (+0200)
Subject: fix bug #151: HTML entities in titles are encoded twice
X-Git-Tag: 1.0-beta4~28
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ffc966d72fa2b5016e143d490994459ff4591571;p=github%2Fwallabag%2Fwallabag.git

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

diff --git a/tpl/home.twig b/tpl/home.twig
index 03f9f70d..58586d7a 100644
--- 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 ba0aae30..0456471e 100644
--- 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>