From: Jeremy Benoist Date: Fri, 5 Feb 2016 13:22:55 +0000 (+0100) Subject: Merge pull request #1650 from wallabag/v2-fix-duplicate-exports X-Git-Tag: 2.0.0-beta.1~50 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=565c8efb4fa2e1073f8428f80ff39da2b3e7cec7;hp=cc67a81818551deed77bd42aba8825c18eb6fad4;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1650 from wallabag/v2-fix-duplicate-exports Exported entries were added twice in export file --- diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index c9aac6e5..6ecdf019 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php @@ -99,6 +99,7 @@ class EntriesExport case 'xml': return $this->produceXML(); + case 'txt': return $this->produceTXT(); } @@ -185,7 +186,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.epub"', 'Content-Transfer-Encoding' => 'binary', ) - )->send(); + ); } /** @@ -235,7 +236,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.mobi"', 'Content-Transfer-Encoding' => 'binary', ) - )->send(); + ); } /** @@ -289,7 +290,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.pdf"', 'Content-Transfer-Encoding' => 'binary', ) - )->send(); + ); } /** @@ -332,7 +333,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.csv"', 'Content-Transfer-Encoding' => 'UTF-8', ) - )->send(); + ); } private function produceJSON() @@ -345,7 +346,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.json"', 'Content-Transfer-Encoding' => 'UTF-8', ) - )->send(); + ); } private function produceXML() @@ -358,7 +359,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.xml"', 'Content-Transfer-Encoding' => 'UTF-8', ) - )->send(); + ); } private function produceTXT() @@ -378,7 +379,7 @@ class EntriesExport 'Content-Disposition' => 'attachment; filename="'.$this->title.'.txt"', 'Content-Transfer-Encoding' => 'UTF-8', ) - )->send(); + ); } /**