diff options
| author | Andrew Dolgov <[email protected]> | 2013-02-17 13:48:15 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-02-17 13:48:15 +0400 |
| commit | 6b3f228fdc5a58fadea5d5431a28d6e617d6e3f5 (patch) | |
| tree | 1e60b9f79b887aa18831d2e5dc1993098dd61a95 | |
| parent | 771012ec04949ada07ee1ffbcf0d66eefc78b051 (diff) | |
ignore VFEED_GROUP_BY_FEED when generating syndicated feeds
| -rw-r--r-- | classes/handler/public.php | 3 | ||||
| -rw-r--r-- | include/functions.php | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index 3d2becccd..4a9b0c48e 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -25,7 +25,8 @@ class Handler_Public extends Handler { $qfh_ret = queryFeedHeadlines($this->link, $feed, $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]; $feed_title = htmlspecialchars($qfh_ret[1]); diff --git a/include/functions.php b/include/functions.php index b64d1b373..981ed595f 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2111,7 +2111,7 @@ 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"]; @@ -2385,7 +2385,7 @@ } // 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) { $order_by = "ttrss_feeds.title, $order_by"; } else { |