update BLACKLISTED_TAGS, bump schema (closes #186)

5 files changed, 11 insertions, 5 deletions

diff --git a/sanity_check.php b/sanity_check.php
index 1f0706dc0..de582760f 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
 	require_once "functions.php";
 
 	define('EXPECTED_CONFIG_VERSION', 13);
-	define('SCHEMA_VERSION', 27);
+	define('SCHEMA_VERSION', 28);
 
 	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 21f4bebbb..b4da8dbfc 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -203,7 +203,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 (27);
+insert into ttrss_version values (28);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -301,7 +301,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('STRIP_UNSAFE_TAGS', 1, 'true', 'Strip unsafe tags from articles', 3,
 'Strip all but most common HTML tags when reading articles.');
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc', 'Blacklisted tags', 3,
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc, uncategorized, blog, blogroll, general, news', 'Blacklisted tags', 3,
 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index bb30e85ee..1a3ab1f0f 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -182,7 +182,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 (27);
+insert into ttrss_version values (28);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -274,7 +274,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('STRIP_UNSAFE_TAGS', 1, 'true', 'Strip unsafe tags from articles', 3,
 'Strip all but most common HTML tags when reading articles.');
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc', 'Blacklisted tags', 3,
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('BLACKLISTED_TAGS', 2, 'main, generic, misc, uncategorized, blog, blogroll, general, news', 'Blacklisted tags', 3,
 'When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2);
diff --git a/schema/versions/mysql/28.sql b/schema/versions/mysql/28.sql
new file mode 100644
index 000000000..ffdf8448e
--- /dev/null
+++ b/schema/versions/mysql/28.sql
@@ -0,0 +1,3 @@
+UPDATE ttrss_prefs SET def_value = 'main, generic, misc, uncategorized, blog, blogroll, general, news' WHERE pref_name = 'BLACKLISTED_TAGS';
+
+update ttrss_version set schema_version = 28;
diff --git a/schema/versions/pgsql/28.sql b/schema/versions/pgsql/28.sql
new file mode 100644
index 000000000..ffdf8448e
--- /dev/null
+++ b/schema/versions/pgsql/28.sql
@@ -0,0 +1,3 @@
+UPDATE ttrss_prefs SET def_value = 'main, generic, misc, uncategorized, blog, blogroll, general, news' WHERE pref_name = 'BLACKLISTED_TAGS';
+
+update ttrss_version set schema_version = 28;