public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-15 15:05:56 +00:00
Code Issues Releases Wiki Activity

fix broken feed tree generation when categories are disabled

Browse Source
This commit is contained in:
Andrew Dolgov
2021-08-18 21:02:58 +03:00
parent 5ed108dce4
commit 0808123179
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/pref/feeds.php
View File

@@ -293,7 +293,7 @@ class Pref_Feeds extends Handler_Protected {
} }
foreach ($feeds_obj->find_many() as $feed) { foreach ($feeds_obj->find_many() as $feed) {
array_push($cat['items'], [ array_push($root['items'], [
'id' => 'FEED:' . $feed->id, 'id' => 'FEED:' . $feed->id,
'bare_id' => (int) $feed->id, 'bare_id' => (int) $feed->id,
'auxcounter' => -1, 'auxcounter' => -1,
@@ -351,7 +351,7 @@ class Pref_Feeds extends Handler_Protected {
$feed_category = ORM::for_table('ttrss_feed_categories') $feed_category = ORM::for_table('ttrss_feed_categories')
->where('owner_uid', $_SESSION['uid']) ->where('owner_uid', $_SESSION['uid'])
->find_one($bare_item_id); ->find_one($bare_item_id);
if ($feed_category) { if ($feed_category) {
$feed_category->parent_cat = $parent_qpart; $feed_category->parent_cat = $parent_qpart;
$feed_category->save(); $feed_category->save();
@@ -389,7 +389,7 @@ class Pref_Feeds extends Handler_Protected {
$feed_category = ORM::for_table('ttrss_feed_categories') $feed_category = ORM::for_table('ttrss_feed_categories')
->where('owner_uid', $_SESSION['uid']) ->where('owner_uid', $_SESSION['uid'])
->find_one($bare_id); ->find_one($bare_id);
if ($feed_category) { if ($feed_category) {
$feed_category->order_id = $order_id; $feed_category->order_id = $order_id;
$feed_category->save(); $feed_category->save();