From d00f22ac59dc01f55e3cc2ccad390705537bd88e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 17 May 2008 05:50:58 +0100
Subject: new option: VFEED_GROUP_BY_FEED (bump schema version)

---
 functions.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'functions.php')

diff --git a/functions.php b/functions.php
index 693b3ddc1..737423913 100644
--- a/functions.php
+++ b/functions.php
@@ -3267,7 +3267,7 @@
 					$offset_query_part = "OFFSET $offset";
 				}
 
-				if ($vfeed_query_part && defined('_VFEED_GROUP_BY_FEED')) {
+				if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
 					if (!$override_order) {
 						$order_by = "ttrss_feeds.title, $order_by";	
 					}
@@ -4928,7 +4928,7 @@
 
 				if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
 
-					if (defined('_VFEED_GROUP_BY_FEED')) {
+					if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
 						if ($feed_id != $vgroup_last_feed) {
 
 							$cur_feed_title = $line["feed_title"];
@@ -4978,7 +4978,7 @@
 #							<a href=\"javascript:viewfeed($feed_id, '', false)\">".
 #							$line["feed_title"]."</a>	
 
-					if (!defined('_VFEED_GROUP_BY_FEED')) {
+					if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
 						if ($line["feed_title"]) {			
 							print "<span class=\"hlFeed\">
 								(<a href=\"javascript:viewfeed($feed_id, '', false)\">".
@@ -5000,7 +5000,7 @@
 
 				} else {
 
-					if (defined('_VFEED_GROUP_BY_FEED')) {
+					if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
 						if ($feed_id != $vgroup_last_feed) {
 
 							$cur_feed_title = $line["feed_title"];
@@ -5051,7 +5051,7 @@
 					} 
 
 
-					if (!defined('_VFEED_GROUP_BY_FEED')) {
+					if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
 						if ($line["feed_title"]) {	
 							print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
 						}
-- 
cgit v1.2.3-54-g00ecf