aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-08-30 13:51:20 +0200
committerGitHub <noreply@github.com>2017-08-30 13:51:20 +0200
commit854616ac6d6246e8e0451342ab841985b401604d (patch)
tree53f25c8612c95fa8c794621da1de650555eb8942
parent2490f61dca635026a3eb9b5e9b6978b1981b1172 (diff)
parentbde23a44f8585c0c668719d9e34f06e30e5571aa (diff)
downloadwallabag-854616ac6d6246e8e0451342ab841985b401604d.tar.gz
wallabag-854616ac6d6246e8e0451342ab841985b401604d.tar.zst
wallabag-854616ac6d6246e8e0451342ab841985b401604d.zip
Merge pull request #3294 from wallabag/export-tag-null
Empty currentTag should be null
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
2 files changed, 2 insertions, 2 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 6424df8d..12cead48 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
@@ -86,7 +86,7 @@
86 86
87 <!-- Export --> 87 <!-- Export -->
88 <aside id="download-form"> 88 <aside id="download-form">
89 {% set currentTag = '' %} 89 {% set currentTag = null %}
90 {% if tag is defined %} 90 {% if tag is defined %}
91 {% set currentTag = tag %} 91 {% set currentTag = tag %}
92 {% endif %} 92 {% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 0c4dc80b..9d6fb3f5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -57,7 +57,7 @@
57 57
58 <!-- Export --> 58 <!-- Export -->
59 <div id="export" class="side-nav right-aligned"> 59 <div id="export" class="side-nav right-aligned">
60 {% set currentTag = '' %} 60 {% set currentTag = null %}
61 {% if tag is defined %} 61 {% if tag is defined %}
62 {% set currentTag = tag.slug %} 62 {% set currentTag = tag.slug %}
63 {% endif %} 63 {% endif %}