From 9cac360bd7783830e5b4ee20615d57755f7ddc15 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 29 Mar 2013 19:37:36 +0400
Subject: [PATCH] set combined display mode as default

---
 include/functions.php         | 2 +-
 schema/ttrss_schema_mysql.sql | 4 ++--
 schema/ttrss_schema_pgsql.sql | 4 ++--
 schema/versions/mysql/111.sql | 7 +++++++
 schema/versions/pgsql/111.sql | 7 +++++++
 5 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 schema/versions/mysql/111.sql
 create mode 100644 schema/versions/pgsql/111.sql

diff --git a/include/functions.php b/include/functions.php
index d789f29e..f174326c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 110);
+	define('SCHEMA_VERSION', 111);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 4b353586..dce3921d 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -291,7 +291,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (110);
+insert into ttrss_version values (111);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -355,7 +355,7 @@ 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) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'true', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread articles',2);
 
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 5117f2e9..8ef7f080 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -249,7 +249,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (110);
+insert into ttrss_version values (111);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -305,7 +305,7 @@ 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) values('SHORT_DATE_FORMAT', 2, 'M d, G:i', 'Short date format',3);
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('LONG_DATE_FORMAT', 2, 'D, M d Y - G:i', 'Long date format',3);
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'true', 'Combined feed display',2, 'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread articles',2);
 
diff --git a/schema/versions/mysql/111.sql b/schema/versions/mysql/111.sql
new file mode 100644
index 00000000..27f287d1
--- /dev/null
+++ b/schema/versions/mysql/111.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'true' where pref_name = 'COMBINED_DISPLAY_MODE';
+
+update ttrss_version set schema_version = 111;
+
+commit;
diff --git a/schema/versions/pgsql/111.sql b/schema/versions/pgsql/111.sql
new file mode 100644
index 00000000..27f287d1
--- /dev/null
+++ b/schema/versions/pgsql/111.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'true' where pref_name = 'COMBINED_DISPLAY_MODE';
+
+update ttrss_version set schema_version = 111;
+
+commit;