diff options
author | Andrew Dolgov <[email protected]> | 2017-07-02 20:27:31 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-07-02 20:27:31 +0300 |
commit | e0f51d786f6bb14ab0a349fe167e797e7a5429b4 (patch) | |
tree | d7f7288c6428b4691a7cc997ee93587853ae8672 | |
parent | 0bf7e007bb3a7039ea11601c7f93c6da33604228 (diff) | |
parent | c053b97697954a60cb809a228a21287ddfbb8211 (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
-rw-r--r-- | classes/api.php | 3 | ||||
-rwxr-xr-x | classes/pref/feeds.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/classes/api.php b/classes/api.php index 0176e1672..00e58ee50 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 785451707..b0f82e7e4 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]; |