aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-28 09:10:14 +0100
committerGitHub <noreply@github.com>2016-12-28 09:10:14 +0100
commit92ba3b5c0dcd8a0d03f592a28b0e26ebd7b045fa (patch)
tree414983268bc46d06dba918d76a4d893289c8bbc1 /src/Wallabag
parent771934632833720c4d0560dc589f22d4f1bdb55e (diff)
parentc8de7ab94cb2d8880205c450ebf52d225991df6e (diff)
downloadwallabag-92ba3b5c0dcd8a0d03f592a28b0e26ebd7b045fa.tar.gz
wallabag-92ba3b5c0dcd8a0d03f592a28b0e26ebd7b045fa.tar.zst
wallabag-92ba3b5c0dcd8a0d03f592a28b0e26ebd7b045fa.zip
Merge pull request #2723 from wallabag/fix-export-tag-space
Fixed export by tags with a tag which contains space
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php2
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 52707cb8..8a093289 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -143,7 +143,7 @@ class TagController extends Controller
143 'form' => null, 143 'form' => null,
144 'entries' => $entries, 144 'entries' => $entries,
145 'currentPage' => $page, 145 'currentPage' => $page,
146 'tag' => $tag->getLabel(), 146 'tag' => $tag->getSlug(),
147 ]); 147 ]);
148 } 148 }
149} 149}
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
index 09e99f36..6de561e0 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
@@ -15,7 +15,7 @@ class LoadTagData extends AbstractFixture implements OrderedFixtureInterface
15 public function load(ObjectManager $manager) 15 public function load(ObjectManager $manager)
16 { 16 {
17 $tag1 = new Tag(); 17 $tag1 = new Tag();
18 $tag1->setLabel('foo'); 18 $tag1->setLabel('foo bar');
19 19
20 $manager->persist($tag1); 20 $manager->persist($tag1);
21 21