From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 26 Jan 2017 12:32:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 2.2
X-Git-Tag: 2.2.0~3^2
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=78295b99dd1721c613f1ce52e2debbe6f6db7753

Merge remote-tracking branch 'origin/master' into 2.2
---

78295b99dd1721c613f1ce52e2debbe6f6db7753
diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 95c84686,4679714e..859b166b
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@@ -27,8 -22,8 +27,8 @@@
      </div>
  
      {% for entry in entries %}
 -        <div id="entry-{{ entry.id|e }}" class="entry">
 +        <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}">
-             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2>
+             <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title|e|raw }}</a></h2>
  
              {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
              <div class="estimatedTime">