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

ignore VFEED_GROUP_BY_FEED when generating syndicated feeds

This commit is contained in:
Andrew Dolgov 2013-02-17 13:48:15 +04:00
parent 771012ec04
commit 6b3f228fdc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/handler/public.php
View File

@ -25,7 +25,8 @@ class Handler_Public extends Handler {
$qfh_ret = queryFeedHeadlines($this->link, $feed, $qfh_ret = queryFeedHeadlines($this->link, $feed,
$limit, $view_mode, $is_cat, $search, $search_mode, $limit, $view_mode, $is_cat, $search, $search_mode,
$match_on, "$date_sort_field DESC", $offset, $owner_uid); $match_on, "$date_sort_field DESC", $offset, $owner_uid,
false, 0, false, true);
$result = $qfh_ret[0]; $result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]); $feed_title = htmlspecialchars($qfh_ret[1]);

4
include/functions.php
View File

@ -2111,7 +2111,7 @@
return $rv; return $rv;
} }
function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false) { function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) {
if (!$owner_uid) $owner_uid = $_SESSION["uid"]; if (!$owner_uid) $owner_uid = $_SESSION["uid"];
@ -2385,7 +2385,7 @@
} }
// proper override_order applied above // proper override_order applied above
if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) { if ($vfeed_query_part && !$ignore_vfeed_group && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
if (!$override_order) { if (!$override_order) {
$order_by = "ttrss_feeds.title, $order_by"; $order_by = "ttrss_feeds.title, $order_by";
} else { } else {