diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-05 14:22:55 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-02-05 14:22:55 +0100 |
commit | 565c8efb4fa2e1073f8428f80ff39da2b3e7cec7 (patch) | |
tree | a56f4ffed8c3e7e3cf7ca0a52f7569e47033cf59 | |
parent | cc67a81818551deed77bd42aba8825c18eb6fad4 (diff) | |
parent | f898102c85e8b2d6a979e91ae2f16278b41d60b6 (diff) | |
download | wallabag-565c8efb4fa2e1073f8428f80ff39da2b3e7cec7.tar.gz wallabag-565c8efb4fa2e1073f8428f80ff39da2b3e7cec7.tar.zst wallabag-565c8efb4fa2e1073f8428f80ff39da2b3e7cec7.zip |
Merge pull request #1650 from wallabag/v2-fix-duplicate-exports
Exported entries were added twice in export file
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/EntriesExport.php | 15 |
1 files changed, 8 insertions, 7 deletions
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 | |||
99 | 99 | ||
100 | case 'xml': | 100 | case 'xml': |
101 | return $this->produceXML(); | 101 | return $this->produceXML(); |
102 | |||
102 | case 'txt': | 103 | case 'txt': |
103 | return $this->produceTXT(); | 104 | return $this->produceTXT(); |
104 | } | 105 | } |
@@ -185,7 +186,7 @@ class EntriesExport | |||
185 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.epub"', | 186 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.epub"', |
186 | 'Content-Transfer-Encoding' => 'binary', | 187 | 'Content-Transfer-Encoding' => 'binary', |
187 | ) | 188 | ) |
188 | )->send(); | 189 | ); |
189 | } | 190 | } |
190 | 191 | ||
191 | /** | 192 | /** |
@@ -235,7 +236,7 @@ class EntriesExport | |||
235 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.mobi"', | 236 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.mobi"', |
236 | 'Content-Transfer-Encoding' => 'binary', | 237 | 'Content-Transfer-Encoding' => 'binary', |
237 | ) | 238 | ) |
238 | )->send(); | 239 | ); |
239 | } | 240 | } |
240 | 241 | ||
241 | /** | 242 | /** |
@@ -289,7 +290,7 @@ class EntriesExport | |||
289 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.pdf"', | 290 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.pdf"', |
290 | 'Content-Transfer-Encoding' => 'binary', | 291 | 'Content-Transfer-Encoding' => 'binary', |
291 | ) | 292 | ) |
292 | )->send(); | 293 | ); |
293 | } | 294 | } |
294 | 295 | ||
295 | /** | 296 | /** |
@@ -332,7 +333,7 @@ class EntriesExport | |||
332 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.csv"', | 333 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.csv"', |
333 | 'Content-Transfer-Encoding' => 'UTF-8', | 334 | 'Content-Transfer-Encoding' => 'UTF-8', |
334 | ) | 335 | ) |
335 | )->send(); | 336 | ); |
336 | } | 337 | } |
337 | 338 | ||
338 | private function produceJSON() | 339 | private function produceJSON() |
@@ -345,7 +346,7 @@ class EntriesExport | |||
345 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.json"', | 346 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.json"', |
346 | 'Content-Transfer-Encoding' => 'UTF-8', | 347 | 'Content-Transfer-Encoding' => 'UTF-8', |
347 | ) | 348 | ) |
348 | )->send(); | 349 | ); |
349 | } | 350 | } |
350 | 351 | ||
351 | private function produceXML() | 352 | private function produceXML() |
@@ -358,7 +359,7 @@ class EntriesExport | |||
358 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.xml"', | 359 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.xml"', |
359 | 'Content-Transfer-Encoding' => 'UTF-8', | 360 | 'Content-Transfer-Encoding' => 'UTF-8', |
360 | ) | 361 | ) |
361 | )->send(); | 362 | ); |
362 | } | 363 | } |
363 | 364 | ||
364 | private function produceTXT() | 365 | private function produceTXT() |
@@ -378,7 +379,7 @@ class EntriesExport | |||
378 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.txt"', | 379 | 'Content-Disposition' => 'attachment; filename="'.$this->title.'.txt"', |
379 | 'Content-Transfer-Encoding' => 'UTF-8', | 380 | 'Content-Transfer-Encoding' => 'UTF-8', |
380 | ) | 381 | ) |
381 | )->send(); | 382 | ); |
382 | } | 383 | } |
383 | 384 | ||
384 | /** | 385 | /** |