From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 27 Mar 2013 08:41:31 +0000 (+0400)
Subject: change description of HIDE_READ_FEEDS
X-Git-Tag: 1.7.6~254
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d14004776ad53b4ce58bdeb969797e0c5bf0155a;p=tt-rss.git

change description of HIDE_READ_FEEDS
---

diff --git a/include/functions.php b/include/functions.php
index c0fccf25..9125247b 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 108);
+	define('SCHEMA_VERSION', 109);
 
 	define('LABEL_BASE_INDEX', -1024);
 
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 2c7a559c..bbc70a5e 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 (108);
+insert into ttrss_version values (109);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -357,7 +357,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,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) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread messages',2);
+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);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'Automatically open next feed with unread articles after marking one as read');
 
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index a3c11456..004fd086 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 (108);
+insert into ttrss_version values (109);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -307,7 +307,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,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) values('HIDE_READ_FEEDS', 1, 'false', 'Hide feeds with no unread messages',2);
+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);
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ON_CATCHUP_SHOW_NEXT_FEED', 1, 'false', 'On catchup show next feed',2, 'Automatically open next feed with unread articles after marking one as read');
 
diff --git a/schema/versions/mysql/109.sql b/schema/versions/mysql/109.sql
new file mode 100644
index 00000000..77e883c3
--- /dev/null
+++ b/schema/versions/mysql/109.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set short_desc = 'Hide feeds with no unread articles' where pref_name = 'HIDE_READ_FEEDS';
+
+update ttrss_version set schema_version = 109;
+
+commit;
diff --git a/schema/versions/pgsql/109.sql b/schema/versions/pgsql/109.sql
new file mode 100644
index 00000000..77e883c3
--- /dev/null
+++ b/schema/versions/pgsql/109.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set short_desc = 'Hide feeds with no unread articles' where pref_name = 'HIDE_READ_FEEDS';
+
+update ttrss_version set schema_version = 109;
+
+commit;