From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 8 Mar 2012 15:01:23 +0000 (+0400)
Subject: API: add order_id to getCategories; add feed_title to getHeadlines; bump api level... 
X-Git-Tag: 1.5.11~34
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b11e9943d86c373d458725b50524d83f17fe4b70;p=tt-rss.git

API: add order_id to getCategories; add feed_title to getHeadlines; bump api level to 3
---

diff --git a/classes/api.php b/classes/api.php
index 1a79ffe2..2e9c1b90 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-	const API_LEVEL  = 2;
+	const API_LEVEL  = 3;
 
 	const STATUS_OK  = 0;
 	const STATUS_ERR = 1;
@@ -126,7 +126,7 @@ class API extends Handler {
 		// TODO do not return empty categories, return Uncategorized and standard virtual cats
 
 		$result = db_query($this->link, "SELECT
-				id, title FROM ttrss_feed_categories
+				id, title, order_id FROM ttrss_feed_categories
 			WHERE owner_uid = " .
 			$_SESSION["uid"]);
 
@@ -138,7 +138,9 @@ class API extends Handler {
 			if ($unread || !$unread_only) {
 				array_push($cats, array("id" => $line["id"],
 					"title" => $line["title"],
-					"unread" => $unread));
+					"unread" => $unread,
+					"order_id" => (int) $line["order_id"],
+				));
 			}
 		}
 
diff --git a/include/functions.php b/include/functions.php
index dc5cbc81..909305af 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -4510,6 +4510,8 @@
 
 				$headline_row["labels"] = $labels;
 
+				$headline_row["feed_title"] = $line["feed_title"];
+
 				array_push($headlines, $headline_row);
 			}