new option: VFEED_GROUP_BY_FEED (bump schema version)

4 files changed, 14 insertions, 8 deletions

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>)";
 						}
diff --git a/sanity_check.php b/sanity_check.php
index 167fef683..1fca50c2a 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
 	require_once "functions.php";
 
 	define('EXPECTED_CONFIG_VERSION', 15);
-	define('SCHEMA_VERSION', 36);
+	define('SCHEMA_VERSION', 37);
 
 	if (!file_exists("config.php")) {
 		print __("<b>Fatal Error</b>: You forgot to copy 
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 293830910..d3082da01 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -209,7 +209,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB;
 
-insert into ttrss_version values (36);
+insert into ttrss_version values (37);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -329,6 +329,9 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2,
+	'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 7e991d69f..6d70ddc6f 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -189,7 +189,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (36);
+insert into ttrss_version values (37);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -303,6 +303,9 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('HIDE_FEEDLIST', 1, 'false', 'Hide feedlist',2, 'This option hides feedlist and allows it to be toggled on the fly, useful for small screens.');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2,
+	'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
+
 create table ttrss_user_prefs (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,