[1203] fixing tag export

[github/wallabag/wallabag.git] / inc / poche / Poche.class.php

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index b27dda6c220fb949670b306e3fc1288f17ed7b97..d297807a8a41e4a50e8533a6eff3eed418188299 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -556,7 +556,7 @@ class Poche
                     if ($this->store->retrieveOneById($next_id, $this->user->getId())) {
                         $next = TRUE;
                     }
-                    $navigate = $arrayName = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
+                    $navigate = array('previous' => $previous, 'previousid' => $previous_id, 'next' => $next, 'nextid' => $next_id);
 
                     # tags
                     $tags = $this->store->retrieveTagsByEntry($entry['id']);
@@ -874,7 +874,7 @@ class Poche
       $filename = "wallabag-export-".$this->user->getId()."-".date("Y-m-d").".json";
       header('Content-Disposition: attachment; filename='.$filename);
 
-      $entries = $this->store->retrieveAll($this->user->getId());
+      $entries = $this->store->retrieveAllWithTags($this->user->getId());
       echo $this->tpl->render('export.twig', array(
           'export' => Tools::renderJson($entries),
       ));