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

author: Jeremy Benoist <jeremy.benoist@gmail.com> 2017-01-26 13:32:07 +0100
committer: Jeremy Benoist <jeremy.benoist@gmail.com> 2017-01-26 13:32:07 +0100
commit: 78295b99dd1721c613f1ce52e2debbe6f6db7753 (patch)
tree: e76f3e8142399316ec5660fab8c646b2c34b8336 /src/Wallabag
parent: 463cb376e357d50c5913452fba68a70bf43492c9 (diff)
parent: 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff)
download: wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.gz
wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.zst
wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.zip
8 files changed, 21 insertions, 21 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 95c84686..859b166b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -28,7 +28,7 @@
    {% for entry in entries %}
        <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">
@@ -65,7 +65,7 @@
                    <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
                {% endfor %}
                </ul>
-                <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" />
+                <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|e|raw }}" />
            {% endif %}
        </div>
    {% endfor %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 8ac2bc0b..a555691d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -1,11 +1,11 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
+{% block title %}{{ entry.title|e|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
 {% block content %}
    <div id="article">
        <header class="mbm">
-            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
+            <h1>{{ entry.title|e|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
        </header>
        <div id="article_toolbar">
@@ -68,7 +68,7 @@
            </aside>
        </div>
        {% if entry.previewPicture is not null %}
-            <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
+            <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|e|raw }}" /></div>
        {% endif %}
        <article>
            {{ entry.content | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
index 16ecaa97..12e8c79f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -18,7 +18,7 @@
        {% for entry in entries %}
            <item>
-                <title><![CDATA[{{ entry.title }}]]></title>
+                <title><![CDATA[{{ entry.title|e }}]]></title>
                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
                <link>{{ entry.url }}</link>
                <guid>{{ entry.url }}</guid>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index f77264c6..623cf1c4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -1,6 +1,6 @@
 <html>
    <head>
-        <title>{{ entry.title | raw }}</title>
+        <title>{{ entry.title|e|raw }}</title>
        <style>
            body {
                margin: 10px;
@@ -27,7 +27,7 @@
                width: 600px;
            }
        </style>
-        <meta property="og:title" content="{{ entry.title | raw }}" />
+        <meta property="og:title" content="{{ entry.title|e|raw }}" />
        <meta property="og:type" content="article" />
        <meta property="og:url" content="{{ app.request.uri }}" />
        {% set picturePath = app.request.schemeAndHttpHost ~ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') %}
@@ -38,13 +38,13 @@
        <meta name="twitter:card" content="summary" />
        <meta name="twitter:image" content="{{ picturePath }}" />
        <meta name="twitter:site" content="@wallabagapp" />
-        <meta name="twitter:title" content="{{ entry.title | raw }}" />
+        <meta name="twitter:title" content="{{ entry.title|e|raw }}" />
        <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
    </head>
    <body>
        <header>
-            <h1>{{ entry.title | raw }}</h1>
+            <h1>{{ entry.title|e|raw }}</h1>
-            <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
+            <div><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a></div>
            <div>{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage')})|raw }}</div>
        </header>
        <article>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
index 0fdd5996..91a1bac0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
@@ -11,8 +11,8 @@
        <div class="card-content">
            <span class="card-title dot-ellipsis dot-resize-update">
-                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
+                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title| e | raw | striptags }}">
-                    {{ entry.title | raw | striptags | truncate(80, true, '…') }}
+                    {{ entry.title | e | raw | striptags | truncate(80, true, '…') }}
                </a>
            </span>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
index 19a400b4..ed916e79 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
@@ -2,8 +2,8 @@
    <div class="card-body">
        <div class="card-content">
            <span class="card-title dot-ellipsis dot-resize-update">
-                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
+                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | e | raw | striptags }}">
-                    {{ entry.title | raw | striptags | truncate(80, true, '…') }}
+                    {{ entry.title | e | raw | striptags | truncate(80, true, '…') }}
                </a>
            </span>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
index b0e3c06d..d23be4d0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
@@ -13,8 +13,8 @@
            <i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
            <span class="card-title dot-ellipsis dot-resize-update">
-                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
+                <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | e | raw | striptags }}">
-                    {{ entry.title| striptags | truncate(80, true, '…') | raw }}
+                    {{ entry.title | e | striptags | truncate(80, true, '…') | raw }}
                </a>
            </span>
@@ -29,8 +29,8 @@
    <div class="card-reveal">
        <i class="card-title activator grey-text text-darken-4 material-icons right">clear</i>
        <span class="card-title">
-            <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
+            <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | e | raw | striptags }}">
-                {{ entry.title | raw | striptags | truncate(80, true, '…') }}
+                {{ entry.title | e | raw | striptags | truncate(80, true, '…') }}
            </a>
        </span>
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 a99bc4ea..15428b92 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
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
+{% block title %}{{ entry.title|e|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
 {% block body_class %}entry{% endblock %}
@@ -209,7 +209,7 @@
 {% block content %}
    <div id="article">
        <header class="mbm">
-            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
+            <h1>{{ entry.title|e|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
        </header>
        <aside>
            <ul class="tools">
author	Jeremy Benoist <jeremy.benoist@gmail.com>	2017-01-26 13:32:07 +0100
committer	Jeremy Benoist <jeremy.benoist@gmail.com>	2017-01-26 13:32:07 +0100
commit	78295b99dd1721c613f1ce52e2debbe6f6db7753 (patch)
tree	e76f3e8142399316ec5660fab8c646b2c34b8336 /src/Wallabag
parent	463cb376e357d50c5913452fba68a70bf43492c9 (diff)
parent	05fa529bcfde01be5d320cb532900d72cf4b0830 (diff)
download	wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.gz wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.tar.zst wallabag-78295b99dd1721c613f1ce52e2debbe6f6db7753.zip

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 95c84686..859b166b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -28,7 +28,7 @@
28		28
29	{% for entry in entries %}	29	{% for entry in entries %}
30	<div id="entry-{{ entry.id\|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}">	30	<div id="entry-{{ entry.id\|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}">
31	<h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title\|raw }}">{{ entry.title\|raw }}</a></h2>	31	<h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title\|e\|raw }}">{{ entry.title\|e\|raw }}</a></h2>
32		32
33	{% set readingTime = entry.readingTime / app.user.config.readingSpeed %}	33	{% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
34	<div class="estimatedTime">	34	<div class="estimatedTime">
@@ -65,7 +65,7 @@
65	<li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>	65	<li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
66	{% endfor %}	66	{% endfor %}
67	</ul>	67	</ul>
68	<img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title\|raw }}" />	68	<img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title\|e\|raw }}" />
69	{% endif %}	69	{% endif %}
70	</div>	70	</div>
71	{% endfor %}	71	{% endfor %}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 8ac2bc0b..a555691d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -1,11 +1,11 @@
1	{% extends "WallabagCoreBundle::layout.html.twig" %}	1	{% extends "WallabagCoreBundle::layout.html.twig" %}
2		2
3	{% block title %}{{ entry.title\|raw }} ({{ entry.domainName\|removeWww }}){% endblock %}	3	{% block title %}{{ entry.title\|e\|raw }} ({{ entry.domainName\|removeWww }}){% endblock %}
4		4
5	{% block content %}	5	{% block content %}
6	<div id="article">	6	<div id="article">
7	<header class="mbm">	7	<header class="mbm">
8	<h1>{{ entry.title\|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'\|trans }}">✎</a></h1>	8	<h1>{{ entry.title\|e\|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" class="nostyle" title="{{ 'entry.view.edit_title'\|trans }}">✎</a></h1>
9	</header>	9	</header>
10		10
11	<div id="article_toolbar">	11	<div id="article_toolbar">
@@ -68,7 +68,7 @@
68	</aside>	68	</aside>
69	</div>	69	</div>
70	{% if entry.previewPicture is not null %}	70	{% if entry.previewPicture is not null %}
71	<div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title\|raw }}" /></div>	71	<div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title\|e\|raw }}" /></div>
72	{% endif %}	72	{% endif %}
73	<article>	73	<article>
74	{{ entry.content \| raw }}	74	{{ entry.content \| raw }}


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig index 16ecaa97..12e8c79f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig
@@ -18,7 +18,7 @@
18	{% for entry in entries %}	18	{% for entry in entries %}
19		19
20	<item>	20	<item>
21	<title><![CDATA[{{ entry.title }}]]></title>	21	<title><![CDATA[{{ entry.title\|e }}]]></title>
22	<source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>	22	<source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
23	<link>{{ entry.url }}</link>	23	<link>{{ entry.url }}</link>
24	<guid>{{ entry.url }}</guid>	24	<guid>{{ entry.url }}</guid>


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig index f77264c6..623cf1c4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -1,6 +1,6 @@
1	<html>	1	<html>
2	<head>	2	<head>
3	<title>{{ entry.title \| raw }}</title>	3	<title>{{ entry.title\|e\|raw }}</title>
4	<style>	4	<style>
5	body {	5	body {
6	margin: 10px;	6	margin: 10px;
@@ -27,7 +27,7 @@
27	width: 600px;	27	width: 600px;
28	}	28	}
29	</style>	29	</style>
30	<meta property="og:title" content="{{ entry.title \| raw }}" />	30	<meta property="og:title" content="{{ entry.title\|e\|raw }}" />
31	<meta property="og:type" content="article" />	31	<meta property="og:type" content="article" />
32	<meta property="og:url" content="{{ app.request.uri }}" />	32	<meta property="og:url" content="{{ app.request.uri }}" />
33	{% set picturePath = app.request.schemeAndHttpHost ~ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') %}	33	{% set picturePath = app.request.schemeAndHttpHost ~ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') %}
@@ -38,13 +38,13 @@
38	<meta name="twitter:card" content="summary" />	38	<meta name="twitter:card" content="summary" />
39	<meta name="twitter:image" content="{{ picturePath }}" />	39	<meta name="twitter:image" content="{{ picturePath }}" />
40	<meta name="twitter:site" content="@wallabagapp" />	40	<meta name="twitter:site" content="@wallabagapp" />
41	<meta name="twitter:title" content="{{ entry.title \| raw }}" />	41	<meta name="twitter:title" content="{{ entry.title\|e\|raw }}" />
42	<meta name="twitter:description" content="{{ entry.content\|striptags\|slice(0, 300)\|raw }}…" />	42	<meta name="twitter:description" content="{{ entry.content\|striptags\|slice(0, 300)\|raw }}…" />
43	</head>	43	</head>
44	<body>	44	<body>
45	<header>	45	<header>
46	<h1>{{ entry.title \| raw }}</h1>	46	<h1>{{ entry.title\|e\|raw }}</h1>
47	<div><a href="{{ entry.url\|e }}" target="_blank" title="{{ 'entry.view.original_article'\|trans }} : {{ entry.title\|e }}" class="tool">{{ entry.domainName\|removeWww }}</a></div>	47	<div><a href="{{ entry.url\|e }}" target="_blank" title="{{ 'entry.view.original_article'\|trans }} : {{ entry.title\|e\|raw }}" class="tool">{{ entry.domainName\|removeWww }}</a></div>
48	<div>{{ "entry.public.shared_by_wallabag"\|trans({'%wallabag_instance%': url('homepage')})\|raw }}</div>	48	<div>{{ "entry.public.shared_by_wallabag"\|trans({'%wallabag_instance%': url('homepage')})\|raw }}</div>
49	</header>	49	</header>
50	<article>	50	<article>


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig index 0fdd5996..91a1bac0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
@@ -11,8 +11,8 @@
11		11
12	<div class="card-content">	12	<div class="card-content">
13	<span class="card-title dot-ellipsis dot-resize-update">	13	<span class="card-title dot-ellipsis dot-resize-update">
14	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| raw \| striptags }}">	14	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title\| e \| raw \| striptags }}">
15	{{ entry.title \| raw \| striptags \| truncate(80, true, '…') }}	15	{{ entry.title \| e \| raw \| striptags \| truncate(80, true, '…') }}
16	</a>	16	</a>
17	</span>	17	</span>
18		18


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig index 19a400b4..ed916e79 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
@@ -2,8 +2,8 @@
2	<div class="card-body">	2	<div class="card-body">
3	<div class="card-content">	3	<div class="card-content">
4	<span class="card-title dot-ellipsis dot-resize-update">	4	<span class="card-title dot-ellipsis dot-resize-update">
5	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| raw \| striptags }}">	5	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| e \| raw \| striptags }}">
6	{{ entry.title \| raw \| striptags \| truncate(80, true, '…') }}	6	{{ entry.title \| e \| raw \| striptags \| truncate(80, true, '…') }}
7	</a>	7	</a>
8	</span>	8	</span>
9		9


diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig index b0e3c06d..d23be4d0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
@@ -13,8 +13,8 @@
13	<i class="grey-text text-darken-4 activator material-icons right">more_vert</i>	13	<i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
14		14
15	<span class="card-title dot-ellipsis dot-resize-update">	15	<span class="card-title dot-ellipsis dot-resize-update">
16	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| raw \| striptags }}">	16	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| e \| raw \| striptags }}">
17	{{ entry.title\| striptags \| truncate(80, true, '…') \| raw }}	17	{{ entry.title \| e \| striptags \| truncate(80, true, '…') \| raw }}
18	</a>	18	</a>
19	</span>	19	</span>
20		20
@@ -29,8 +29,8 @@
29	<div class="card-reveal">	29	<div class="card-reveal">
30	<i class="card-title activator grey-text text-darken-4 material-icons right">clear</i>	30	<i class="card-title activator grey-text text-darken-4 material-icons right">clear</i>
31	<span class="card-title">	31	<span class="card-title">
32	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| raw \| striptags }}">	32	<a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title \| e \| raw \| striptags }}">
33	{{ entry.title \| raw \| striptags \| truncate(80, true, '…') }}	33	{{ entry.title \| e \| raw \| striptags \| truncate(80, true, '…') }}
34	</a>	34	</a>
35	</span>	35	</span>
36		36


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 a99bc4ea..15428b92 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
@@ -1,6 +1,6 @@
1	{% extends "WallabagCoreBundle::layout.html.twig" %}	1	{% extends "WallabagCoreBundle::layout.html.twig" %}
2		2
3	{% block title %}{{ entry.title\|raw }} ({{ entry.domainName\|removeWww }}){% endblock %}	3	{% block title %}{{ entry.title\|e\|raw }} ({{ entry.domainName\|removeWww }}){% endblock %}
4		4
5	{% block body_class %}entry{% endblock %}	5	{% block body_class %}entry{% endblock %}
6		6
@@ -209,7 +209,7 @@
209	{% block content %}	209	{% block content %}
210	<div id="article">	210	<div id="article">
211	<header class="mbm">	211	<header class="mbm">
212	<h1>{{ entry.title\|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'\|trans }}">✎</a></h1>	212	<h1>{{ entry.title\|e\|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'\|trans }}">✎</a></h1>
213	</header>	213	</header>
214	<aside>	214	<aside>
215	<ul class="tools">	215	<ul class="tools">