From 2dcb7e80e5ebcbe64c317681449db39c2bcab97a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 8 Aug 2008 06:22:38 +0100 Subject: [PATCH] rename description of option ENABLE_FEED_ICONS, bump schema --- localized_schema.php | 2 +- sanity_check.php | 2 +- schema/ttrss_schema_mysql.sql | 4 ++-- schema/ttrss_schema_pgsql.sql | 4 ++-- schema/versions/mysql/40.sql | 3 +++ schema/versions/pgsql/40.sql | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 schema/versions/mysql/40.sql create mode 100644 schema/versions/pgsql/40.sql diff --git a/localized_schema.php b/localized_schema.php index d989c9336..623160ec1 100644 --- a/localized_schema.php +++ b/localized_schema.php @@ -59,7 +59,7 @@ __("Blacklisted tags"); __("When auto-detecting tags in articles these tags will not be applied (comma-separated list)."); __("Confirm marking feed as read"); - __("Enable icons in feedlist"); + __("Enable feed icons"); __("Enable labels"); __("Experimental support for virtual feeds based on user crafted SQL queries. This feature is highly experimental and at this point not user friendly. Use with caution."); __("Long date format"); diff --git a/sanity_check.php b/sanity_check.php index 1afd28d94..5a2974dd6 100644 --- a/sanity_check.php +++ b/sanity_check.php @@ -2,7 +2,7 @@ require_once "functions.php"; define('EXPECTED_CONFIG_VERSION', 17); - define('SCHEMA_VERSION', 39); + define('SCHEMA_VERSION', 40); if (!file_exists("config.php")) { print __("Fatal Error: You forgot to copy diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 44c1e0c23..2bf8da59d 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 (39); +insert into ttrss_version values (40); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -246,7 +246,7 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key, index(section_id), foreign key (section_id) references ttrss_prefs_sections(id)) TYPE=InnoDB; -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable icons in feedlist',3); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable feed icons',3); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', 'Purge old posts after this number of days (0 - disables)',1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'Update post on checksum change',1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'Enable labels',3, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 4f3125742..bb2d7d2e8 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 (39); +insert into ttrss_version values (40); create table ttrss_enclosures (id serial not null primary key, content_url text not null, @@ -220,7 +220,7 @@ create table ttrss_prefs (pref_name varchar(250) not null primary key, access_level integer not null default 0, def_value text not null); -insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable icons in feedlist',3); +insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_ICONS', 1, 'true', 'Enable feed icons',3); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('PURGE_OLD_DAYS', 3, '60', 'Purge old posts after this number of days (0 - disables)',1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('UPDATE_POST_ON_CHECKSUM_CHANGE', 1, 'true', 'Update post on checksum change',1); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('ENABLE_LABELS', 1, 'false', 'Enable labels',3, diff --git a/schema/versions/mysql/40.sql b/schema/versions/mysql/40.sql new file mode 100644 index 000000000..5a506cea6 --- /dev/null +++ b/schema/versions/mysql/40.sql @@ -0,0 +1,3 @@ +update ttrss_prefs set short_desc = 'Enable feed icons' where pref_name = 'ENABLE_FEED_ICONS'; + +update ttrss_version set schema_version = 40; diff --git a/schema/versions/pgsql/40.sql b/schema/versions/pgsql/40.sql new file mode 100644 index 000000000..5a506cea6 --- /dev/null +++ b/schema/versions/pgsql/40.sql @@ -0,0 +1,3 @@ +update ttrss_prefs set short_desc = 'Enable feed icons' where pref_name = 'ENABLE_FEED_ICONS'; + +update ttrss_version set schema_version = 40;