From c053b97697954a60cb809a228a21287ddfbb8211 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 26 Jun 2017 16:29:57 +0300 Subject: [PATCH] pref/feeds: start user category ordering from 1 api, getFeeds: send subcategory order_id --- classes/api.php | 3 ++- classes/pref/feeds.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/api.php b/classes/api.php index 0176e167..00e58ee5 100644 --- a/classes/api.php +++ b/classes/api.php @@ -569,7 +569,7 @@ class API extends Handler { if ($include_nested && $cat_id) { $result = db_query("SELECT - id, title FROM ttrss_feed_categories + id, title, order_id FROM ttrss_feed_categories WHERE parent_cat = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . " ORDER BY id, title"); @@ -583,6 +583,7 @@ class API extends Handler { "title" => $line["title"], "unread" => $unread, "is_cat" => true, + "order_id" => (int) $line["order_id"] ); array_push($feeds, $row); } diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 78545170..b0f82e7e 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -339,7 +339,7 @@ class Pref_Feeds extends Handler_Protected { owner_uid = " . $_SESSION["uid"]); } - $order_id = 0; + $order_id = 1; $cat = $data_map[$item_id]; -- 2.39.5