valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov 2017-07-02 20:27:31 +03:00
parent 0bf7e007bb c053b97697
commit e0f51d786f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/api.php
View File

@ -569,7 +569,7 @@ class API extends Handler {
if ($include_nested && $cat_id) { if ($include_nested && $cat_id) {
$result = db_query("SELECT $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"] . WHERE parent_cat = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
" ORDER BY id, title"); " ORDER BY id, title");
@ -583,6 +583,7 @@ class API extends Handler {
"title" => $line["title"], "title" => $line["title"],
"unread" => $unread, "unread" => $unread,
"is_cat" => true, "is_cat" => true,
"order_id" => (int) $line["order_id"]
); );
array_push($feeds, $row); array_push($feeds, $row);
} }

2
classes/pref/feeds.php
View File

@ -339,7 +339,7 @@ class Pref_Feeds extends Handler_Protected {
owner_uid = " . $_SESSION["uid"]); owner_uid = " . $_SESSION["uid"]);
} }
$order_id = 0; $order_id = 1;
$cat = $data_map[$item_id]; $cat = $data_map[$item_id];