From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 17 Feb 2013 09:48:15 +0000 (+0400)
Subject: ignore VFEED_GROUP_BY_FEED when generating syndicated feeds
X-Git-Tag: 1.7.0~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6b3f228fdc5a58fadea5d5431a28d6e617d6e3f5;p=tt-rss.git

ignore VFEED_GROUP_BY_FEED when generating syndicated feeds
---

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3d2beccc..4a9b0c48 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 b64d1b37..981ed595 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 {