diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-06-06 17:02:55 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-06-06 17:02:55 +0200 |
commit | c56d1f21e3138212d00d7343665a8f3e65cf594a (patch) | |
tree | 48ae67bc8688e08cabc5b60a78072a81d903c1f4 /inc/poche/Poche.class.php | |
parent | 22a46267beef273f8602d569a22281af2207fdbe (diff) | |
parent | 63fc40ff8465cd14b6221636ccbd2d9d9c07787e (diff) | |
download | wallabag-c56d1f21e3138212d00d7343665a8f3e65cf594a.tar.gz wallabag-c56d1f21e3138212d00d7343665a8f3e65cf594a.tar.zst wallabag-c56d1f21e3138212d00d7343665a8f3e65cf594a.zip |
Merge pull request #1207 from vpmalley/dev
issue #1203: fixing tag export
Diffstat (limited to 'inc/poche/Poche.class.php')
-rwxr-xr-x | inc/poche/Poche.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4fb028ff..779c04c2 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -278,7 +278,7 @@ class Poche | |||
278 | } | 278 | } |
279 | Tools::logm($msg); | 279 | Tools::logm($msg); |
280 | } | 280 | } |
281 | Tools::redirect('?'); | 281 | Tools::redirect(); |
282 | break; | 282 | break; |
283 | case 'toggle_fav' : | 283 | case 'toggle_fav' : |
284 | $this->store->favoriteById($id, $this->user->getId()); | 284 | $this->store->favoriteById($id, $this->user->getId()); |
@@ -896,7 +896,7 @@ class Poche | |||
896 | $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json"; | 896 | $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json"; |
897 | header('Content-Disposition: attachment; filename='.$filename); | 897 | header('Content-Disposition: attachment; filename='.$filename); |
898 | 898 | ||
899 | $entries = $this->store->retrieveAll($this->user->getId()); | 899 | $entries = $this->store->retrieveAllWithTags($this->user->getId()); |
900 | echo $this->tpl->render('export.twig', array( | 900 | echo $this->tpl->render('export.twig', array( |
901 | 'export' => Tools::renderJson($entries), | 901 | 'export' => Tools::renderJson($entries), |
902 | )); | 902 | )); |