From 6b3f228fdc5a58fadea5d5431a28d6e617d6e3f5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 17 Feb 2013 13:48:15 +0400 Subject: ignore VFEED_GROUP_BY_FEED when generating syndicated feeds --- include/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/functions.php') 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 { -- cgit v1.2.3