From 080812317939cd9af2f778c15ea4f769fae30b28 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 18 Aug 2021 21:02:58 +0300 Subject: [PATCH] fix broken feed tree generation when categories are disabled --- classes/pref/feeds.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 7c8ac4db1..f53ccf2f5 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -293,7 +293,7 @@ class Pref_Feeds extends Handler_Protected { } foreach ($feeds_obj->find_many() as $feed) { - array_push($cat['items'], [ + array_push($root['items'], [ 'id' => 'FEED:' . $feed->id, 'bare_id' => (int) $feed->id, 'auxcounter' => -1, @@ -351,7 +351,7 @@ class Pref_Feeds extends Handler_Protected { $feed_category = ORM::for_table('ttrss_feed_categories') ->where('owner_uid', $_SESSION['uid']) ->find_one($bare_item_id); - + if ($feed_category) { $feed_category->parent_cat = $parent_qpart; $feed_category->save(); @@ -389,7 +389,7 @@ class Pref_Feeds extends Handler_Protected { $feed_category = ORM::for_table('ttrss_feed_categories') ->where('owner_uid', $_SESSION['uid']) ->find_one($bare_id); - + if ($feed_category) { $feed_category->order_id = $order_id; $feed_category->save();