diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-07-03 13:55:25 +0200 |
commit | 44043ebe82a22470e2514d05efac324035ee809a (patch) | |
tree | 5ea40b62ce665a8bab6a3e280a47f3be11838e27 /src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |
parent | 11f15430ffc67e30f084cffc8e909ace87ce19e1 (diff) | |
parent | e586d65b64089fc1cc230a18c470aae3f45f91a6 (diff) | |
download | wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.gz wallabag-44043ebe82a22470e2514d05efac324035ee809a.tar.zst wallabag-44043ebe82a22470e2514d05efac324035ee809a.zip |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 0d05f4d5..7484d53b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | |||
@@ -245,7 +245,7 @@ | |||
245 | <li> | 245 | <li> |
246 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> | 246 | <i class="material-icons" title="{{ 'entry.view.published_by'|trans }}">person</i> |
247 | {% for author in entry.publishedBy %} | 247 | {% for author in entry.publishedBy %} |
248 | {{ author }}{% if not loop.last %}, {% endif %} | 248 | {{ author|raw }}{% if not loop.last %}, {% endif %} |
249 | {% endfor %} | 249 | {% endfor %} |
250 | </li> | 250 | </li> |
251 | {% endif %} | 251 | {% endif %} |
@@ -276,7 +276,7 @@ | |||
276 | </div> | 276 | </div> |
277 | 277 | ||
278 | {% if entry.previewPicture is not null %} | 278 | {% if entry.previewPicture is not null %} |
279 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" /></div> | 279 | <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}" /></div> |
280 | {% endif %} | 280 | {% endif %} |
281 | 281 | ||
282 | </aside> | 282 | </aside> |