summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/api.php3
-rwxr-xr-xclasses/pref/feeds.php2
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];