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

API: add order_id to getFeeds

This commit is contained in:
Andrew Dolgov 2012-03-08 19:30:23 +04:00
parent b11e9943d8
commit c8226ce4cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/functions.php
View File

@ -4411,7 +4411,7 @@
if ($cat_id == -4 || $cat_id == -3) { if ($cat_id == -4 || $cat_id == -3) {
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id, feed_url, cat_id, title, ". id, feed_url, cat_id, title, order_id, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
" ORDER BY cat_id, title " . $limit_qpart); " ORDER BY cat_id, title " . $limit_qpart);
@ -4423,7 +4423,7 @@
$cat_qpart = "cat_id IS NULL"; $cat_qpart = "cat_id IS NULL";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id, feed_url, cat_id, title, ". id, feed_url, cat_id, title, order_id, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE FROM ttrss_feeds WHERE
$cat_qpart AND owner_uid = " . $_SESSION["uid"] . $cat_qpart AND owner_uid = " . $_SESSION["uid"] .
@ -4445,7 +4445,8 @@
"unread" => (int)$unread, "unread" => (int)$unread,
"has_icon" => $has_icon, "has_icon" => $has_icon,
"cat_id" => (int)$line["cat_id"], "cat_id" => (int)$line["cat_id"],
"last_updated" => strtotime($line["last_updated"]) "last_updated" => strtotime($line["last_updated"]),
"order_id" => (int) $line["order_id"],
); );
array_push($feeds, $row); array_push($feeds, $row);