diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-04-15 13:29:53 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-04-15 13:29:53 +0200 |
commit | 729c89aec41c7f53411deb43389e2b775a29d073 (patch) | |
tree | 3fd2b8f4553a3ba3e7820b864a9a722fc3064f1c /inc/poche/Poche.class.php | |
parent | 04ffc7fb11f9e98991ee5bc0511ce5d96a7755c7 (diff) | |
parent | af8b3b649e9956fe15c98298faf6755c29edcf77 (diff) | |
download | wallabag-729c89aec41c7f53411deb43389e2b775a29d073.tar.gz wallabag-729c89aec41c7f53411deb43389e2b775a29d073.tar.zst wallabag-729c89aec41c7f53411deb43389e2b775a29d073.zip |
Merge pull request #1866 from ymage/dev
Fix UTF-8 encoding before JSON export
Diffstat (limited to 'inc/poche/Poche.class.php')
-rwxr-xr-x | inc/poche/Poche.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 400857b4..1476d158 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -908,7 +908,7 @@ class Poche | |||
908 | $entries = $this->store->retrieveAllWithTags($this->user->getId()); | 908 | $entries = $this->store->retrieveAllWithTags($this->user->getId()); |
909 | if ($entries) { | 909 | if ($entries) { |
910 | echo $this->tpl->render('export.twig', array( | 910 | echo $this->tpl->render('export.twig', array( |
911 | 'export' => Tools::renderJson($entries), | 911 | 'export' => Tools::renderJson(Tools::utf8ize($entries)), |
912 | )); | 912 | )); |
913 | Tools::logm('export view'); | 913 | Tools::logm('export view'); |
914 | } else { | 914 | } else { |