aboutsummaryrefslogtreecommitdiff
path: root/app/views/helpers/export/articles.phtml
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2023-09-04 10:09:37 +0200
committerGravatar GitHub <noreply@github.com> 2023-09-04 10:09:37 +0200
commit1c7c1016f4a5147003ed1c438b8a386a63a53cab (patch)
treea0639042ac205cd20863cd24496e79ddae3f562e /app/views/helpers/export/articles.phtml
parentda405ceee628dca739a12b234a6094a8ebae9c94 (diff)
Fix JSON export/import (#5626)
* Fix import with empty content fix https://github.com/FreshRSS/FreshRSS/issues/5622 Cherry picks on https://github.com/FreshRSS/FreshRSS/pull/5584 * Fix export of tags / labels Article-defined tags were wrongly exported as user-defined labels. * Fix export of tags / labels Article-defined tags were wrongly exported as user-defined labels. * Fix bug with many labels * Better typing * Comments
Diffstat (limited to 'app/views/helpers/export/articles.phtml')
-rw-r--r--app/views/helpers/export/articles.phtml6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/views/helpers/export/articles.phtml b/app/views/helpers/export/articles.phtml
index 60041339b..1db627bf7 100644
--- a/app/views/helpers/export/articles.phtml
+++ b/app/views/helpers/export/articles.phtml
@@ -26,11 +26,7 @@ foreach ($this->entries as $entry) {
$feed = $this->feed ?? FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feedId());
$entry->_feed($feed);
- if (isset($this->entryIdsTagNames['e_' . $entry->id()])) {
- $entry->_tags($this->entryIdsTagNames['e_' . $entry->id()]);
- }
-
- $article = $entry->toGReader('freshrss');
+ $article = $entry->toGReader('freshrss', $this->entryIdsTagNames['e_' . $entry->id()] ?? []);
$line = json_encode($article, $options);
if ($line != '') {