Merge pull request #581 from Oldiesmann/release-2.1

disregard -> unwatch in upgrade SQL files

other/upgrade_2-1_mysql.sql

@@ -188,19 +188,19 @@ ADD COLUMN deny_member_groups varchar(255) NOT NULL DEFAULT '';
 ---#
 
 /******************************************************************************/
---- Adding support for topic disregard
+--- Adding support for topic unwatch
 /******************************************************************************/
 ---# Adding new columns to boards...
 ALTER TABLE {$db_prefix}log_topics
-ADD COLUMN disregarded tinyint(3) NOT NULL DEFAULT '0';
+ADD COLUMN unwatched tinyint(3) NOT NULL DEFAULT '0';
 
 UPDATE {$db_prefix}log_topics
-SET disregarded = 0;
+SET unwatched = 0;
 
 INSERT INTO {$db_prefix}settings
 	(variable, value)
 VALUES
-	('enable_disregard', 0);
+	('enable_unwatch', 0);
 ---#
 
 /******************************************************************************/

other/upgrade_2-1_postgresql.sql

@@ -245,21 +245,21 @@ upgrade_query("
 ---#
 
 /******************************************************************************/
---- Adding support for topic disregard
+--- Adding support for topic unwatch
 /******************************************************************************/
 ---# Adding new columns to log_topics...
 ---{
 upgrade_query("
 	ALTER TABLE {$db_prefix}log_topics
-	ADD COLUMN disregarded int NOT NULL DEFAULT '0'");
+	ADD COLUMN unwatched int NOT NULL DEFAULT '0'");
 
 UPDATE {$db_prefix}log_topics
-SET disregarded = 0;
+SET unwatched = 0;
 
 INSERT INTO {$db_prefix}settings
 	(variable, value)
 VALUES
-	('enable_disregard', 0);
+	('enable_unwatch', 0);
 ---}
 ---#
 

other/upgrade_2-1_sqlite.sql

@@ -221,14 +221,14 @@ $smcFunc['db_alter_table']('{db_prefix}boards', array(
 ---#
 
 /******************************************************************************/
---- Adding support for topic disregard
+--- Adding support for topic unwatch
 /******************************************************************************/
 ---# Adding new columns to log_topics...
 ---{
 $smcFunc['db_alter_table']('{db_prefix}log_topics', array(
 	'add' => array(
-		'disregarded' => array(
-			'name' => 'disregarded',
+		'unwatched' => array(
+			'name' => 'unwatched',
 			'null' => false,
 			'default' => 0,
 			'type' => 'int',
@@ -238,12 +238,12 @@ $smcFunc['db_alter_table']('{db_prefix}log_topics', array(
 ));
 
 UPDATE {$db_prefix}log_topics
-SET disregarded = 0;
+SET unwatched = 0;
 
 INSERT INTO {$db_prefix}settings
 	(variable, value)
 VALUES
-	('enable_disregard', 0);
+	('enable_unwatch', 0);
 ---}
 ---#