ignore VFEED_GROUP_BY_FEED when generating syndicated feeds

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3d2becccde04c0c5d4ac4fb94c50e3515373d336..4a9b0c48eeb6ad0a89b8d0f5648f0bd9dd892975 100644 (file)
--- 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 b64d1b373d4cdf25c4c98b25b12e346abd72bd59..981ed595f20880f4092c82e79dd6c2aef9222bf6 100644 (file)
--- 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 {