pref/feeds: start user category ordering from 1

[tt-rss.git] / classes / api.php

diff --git a/classes/api.php b/classes/api.php
index 220d37981e2b4159cacb23f9db95a86491989c75..00e58ee502b1d31c502680b57ce748cd129e1743 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -301,17 +301,6 @@ class API extends Handler {
                                }
                        }
 
-                       if ($num_updated > 0 && $field == "published") {
-                               if (PUBSUBHUBBUB_HUB) {
-                                       $rss_link = get_self_url_prefix() .
-                                               "/public.php?op=rss&id=-2&key=" .
-                                               get_feed_access_key(-2, false);
-
-                                       $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
-                                       $p->publish_update($rss_link);
-                               }
-                       }
-
                        $this->wrap(self::STATUS_OK, array("status" => "OK",
                                "updated" => $num_updated));
 
@@ -580,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");
 
@@ -594,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);
                                        }