From f9c8087f787b6ac38ca2c3b6a876a803860b8991 Mon Sep 17 00:00:00 2001
From: Vincent Malley <vincent.malley@insalien.org>
Date: Tue, 2 Jun 2015 11:09:28 -0400
Subject: [1203] fixing tag export

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 465d9f95..d297807a 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -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),
       ));
-- 
cgit v1.2.3


From 63fc40ff8465cd14b6221636ccbd2d9d9c07787e Mon Sep 17 00:00:00 2001
From: Vincent Malley <vincent.malley@insalien.org>
Date: Tue, 2 Jun 2015 15:29:44 -0400
Subject: [1005] fixing redirection when deleting archived article

---
 inc/poche/Poche.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Poche.class.php')

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 0754d659..779c04c2 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -278,7 +278,7 @@ class Poche
                     }
                     Tools::logm($msg);
                 }
-                Tools::redirect('?');
+                Tools::redirect();
                 break;
             case 'toggle_fav' :
                 $this->store->favoriteById($id, $this->user->getId());
-- 
cgit v1.2.3