From 1c7c1016f4a5147003ed1c438b8a386a63a53cab Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 4 Sep 2023 10:09:37 +0200
Subject: 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
---
 p/api/greader.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'p/api/greader.php')

diff --git a/p/api/greader.php b/p/api/greader.php
index e42736869..a014a4db1 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -573,11 +573,7 @@ final class GReaderAPI {
 			}
 			$entry->_feed($feed);
 
-			if (isset($entryIdsTagNames['e_' . $entry->id()])) {
-				$entry->_tags($entryIdsTagNames['e_' . $entry->id()]);
-			}
-
-			$items[] = $entry->toGReader('compat');
+			$items[] = $entry->toGReader('compat', $entryIdsTagNames['e_' . $entry->id()] ?? []);
 		}
 		return $items;
 	}
-- 
cgit v1.2.3