7 files changed, 35 insertions, 35 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 1e4ae2e132..5e13f98f25 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -621,12 +621,12 @@ END;;
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id INTEGER NOT NULL,
-	item_type VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	item_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	item_id INTEGER DEFAULT 0 NOT NULL,
 	item_parent_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
 	unread INTEGER DEFAULT 1 NOT NULL,
-	is_disabled INTEGER DEFAULT 0 NOT NULL,
+	is_enabled INTEGER DEFAULT 1 NOT NULL,
 	time INTEGER DEFAULT 1 NOT NULL,
 	data BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL
 );;
@@ -639,7 +639,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications(item_parent_id)
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications(user_id);;
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications(time);;
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications(unread);;
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications(is_disabled);;
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications(is_enabled);;
 
 CREATE GENERATOR phpbb_notifications_gen;;
 SET GENERATOR phpbb_notifications_gen TO 0;;
@@ -1237,10 +1237,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch(notify_status)
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	item_type VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	item_id INTEGER DEFAULT 0 NOT NULL,
 	user_id INTEGER DEFAULT 0 NOT NULL,
-	method VARCHAR(25) CHARACTER SET NONE DEFAULT '' NOT NULL
+	method VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL
 );;
 
 ALTER TABLE phpbb_user_notifications ADD PRIMARY KEY (item_type, item_id, user_id, method);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 5a397743c4..d463afb17c 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -756,12 +756,12 @@ GO
 */
 CREATE TABLE [phpbb_notifications] (
 	[notification_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[item_type] [varchar] (25) DEFAULT ('') NOT NULL ,
+	[item_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[item_id] [int] DEFAULT (0) NOT NULL ,
 	[item_parent_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[unread] [int] DEFAULT (1) NOT NULL ,
-	[is_disabled] [int] DEFAULT (0) NOT NULL ,
+	[is_enabled] [int] DEFAULT (1) NOT NULL ,
 	[time] [int] DEFAULT (1) NOT NULL ,
 	[data] [varchar] (4000) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
@@ -792,7 +792,7 @@ GO
 CREATE  INDEX [unread] ON [phpbb_notifications]([unread]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [is_disabled] ON [phpbb_notifications]([is_disabled]) ON [PRIMARY]
+CREATE  INDEX [is_enabled] ON [phpbb_notifications]([is_enabled]) ON [PRIMARY]
 GO
 
 
@@ -1523,10 +1523,10 @@ GO
 	Table: 'phpbb_user_notifications'
 */
 CREATE TABLE [phpbb_user_notifications] (
-	[item_type] [varchar] (25) DEFAULT ('') NOT NULL ,
+	[item_type] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[item_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[method] [varchar] (25) DEFAULT ('') NOT NULL 
+	[method] [varchar] (255) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index fd7f9a6025..9272e18735 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -433,12 +433,12 @@ CREATE TABLE phpbb_modules (
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	item_type varbinary(25) DEFAULT '' NOT NULL,
+	item_type varbinary(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	is_disabled tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	is_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data blob NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -448,7 +448,7 @@ CREATE TABLE phpbb_notifications (
 	KEY user_id (user_id),
 	KEY time (time),
 	KEY unread (unread),
-	KEY is_disabled (is_disabled)
+	KEY is_enabled (is_enabled)
 );
 
 
@@ -873,10 +873,10 @@ CREATE TABLE phpbb_topics_watch (
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type varbinary(25) DEFAULT '' NOT NULL,
+	item_type varbinary(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	method varbinary(25) DEFAULT '' NOT NULL,
+	method varbinary(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method),
 	KEY it (item_type),
 	KEY uid (user_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 8700b46c91..a73fda41f5 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -433,12 +433,12 @@ CREATE TABLE phpbb_modules (
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	item_parent_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	unread tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
-	is_disabled tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	is_enabled tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	time int(11) UNSIGNED DEFAULT '1' NOT NULL,
 	data text NOT NULL,
 	PRIMARY KEY (notification_id),
@@ -448,7 +448,7 @@ CREATE TABLE phpbb_notifications (
 	KEY user_id (user_id),
 	KEY time (time),
 	KEY unread (unread),
-	KEY is_disabled (is_disabled)
+	KEY is_enabled (is_enabled)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
@@ -873,10 +873,10 @@ CREATE TABLE phpbb_topics_watch (
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	method varchar(25) DEFAULT '' NOT NULL,
+	method varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method),
 	KEY it (item_type),
 	KEY uid (user_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index f2f22e2f5e..02be9566dc 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -845,12 +845,12 @@ END;
 */
 CREATE TABLE phpbb_notifications (
 	notification_id number(8) NOT NULL,
-	item_type varchar2(25) DEFAULT '' ,
+	item_type varchar2(255) DEFAULT '' ,
 	item_id number(8) DEFAULT '0' NOT NULL,
 	item_parent_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
 	unread number(1) DEFAULT '1' NOT NULL,
-	is_disabled number(1) DEFAULT '0' NOT NULL,
+	is_enabled number(1) DEFAULT '1' NOT NULL,
 	time number(11) DEFAULT '1' NOT NULL,
 	data clob DEFAULT '' ,
 	CONSTRAINT pk_phpbb_notifications PRIMARY KEY (notification_id)
@@ -869,7 +869,7 @@ CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time)
 /
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread)
 /
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled)
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled)
 /
 
 CREATE SEQUENCE phpbb_notifications_seq
@@ -1641,10 +1641,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status
 	Table: 'phpbb_user_notifications'
 */
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar2(25) DEFAULT '' ,
+	item_type varchar2(255) DEFAULT '' ,
 	item_id number(8) DEFAULT '0' NOT NULL,
 	user_id number(8) DEFAULT '0' NOT NULL,
-	method varchar2(25) DEFAULT '' ,
+	method varchar2(255) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_user_notifications PRIMARY KEY (item_type, item_id, user_id, method)
 )
 /
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index ffba657475..784e3c8c68 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -603,12 +603,12 @@ CREATE SEQUENCE phpbb_notifications_seq;
 
 CREATE TABLE phpbb_notifications (
 	notification_id INT4 DEFAULT nextval('phpbb_notifications_seq'),
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	item_parent_id INT4 DEFAULT '0' NOT NULL CHECK (item_parent_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
 	unread INT2 DEFAULT '1' NOT NULL CHECK (unread >= 0),
-	is_disabled INT2 DEFAULT '0' NOT NULL CHECK (is_disabled >= 0),
+	is_enabled INT2 DEFAULT '1' NOT NULL CHECK (is_enabled >= 0),
 	time INT4 DEFAULT '1' NOT NULL CHECK (time >= 0),
 	data varchar(4000) DEFAULT '' NOT NULL,
 	PRIMARY KEY (notification_id)
@@ -620,7 +620,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled);
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled);
 
 /*
 	Table: 'phpbb_poll_options'
@@ -1123,10 +1123,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status
 	Table: 'phpbb_user_notifications'
 */
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar(25) DEFAULT '' NOT NULL,
+	item_type varchar(255) DEFAULT '' NOT NULL,
 	item_id INT4 DEFAULT '0' NOT NULL CHECK (item_id >= 0),
 	user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
-	method varchar(25) DEFAULT '' NOT NULL,
+	method varchar(255) DEFAULT '' NOT NULL,
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index b63569ce3e..2fdac43947 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -420,12 +420,12 @@ CREATE INDEX phpbb_modules_class_left_id ON phpbb_modules (module_class, left_id
 # Table: 'phpbb_notifications'
 CREATE TABLE phpbb_notifications (
 	notification_id INTEGER PRIMARY KEY NOT NULL ,
-	item_type varchar(25) NOT NULL DEFAULT '',
+	item_type varchar(255) NOT NULL DEFAULT '',
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	item_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	unread INTEGER UNSIGNED NOT NULL DEFAULT '1',
-	is_disabled INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	is_enabled INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	time INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	data text(65535) NOT NULL DEFAULT ''
 );
@@ -436,7 +436,7 @@ CREATE INDEX phpbb_notifications_item_pid ON phpbb_notifications (item_parent_id
 CREATE INDEX phpbb_notifications_user_id ON phpbb_notifications (user_id);
 CREATE INDEX phpbb_notifications_time ON phpbb_notifications (time);
 CREATE INDEX phpbb_notifications_unread ON phpbb_notifications (unread);
-CREATE INDEX phpbb_notifications_is_disabled ON phpbb_notifications (is_disabled);
+CREATE INDEX phpbb_notifications_is_enabled ON phpbb_notifications (is_enabled);
 
 # Table: 'phpbb_poll_options'
 CREATE TABLE phpbb_poll_options (
@@ -846,10 +846,10 @@ CREATE INDEX phpbb_topics_watch_notify_stat ON phpbb_topics_watch (notify_status
 
 # Table: 'phpbb_user_notifications'
 CREATE TABLE phpbb_user_notifications (
-	item_type varchar(25) NOT NULL DEFAULT '',
+	item_type varchar(255) NOT NULL DEFAULT '',
 	item_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	method varchar(25) NOT NULL DEFAULT '',
+	method varchar(255) NOT NULL DEFAULT '',
 	PRIMARY KEY (item_type, item_id, user_id, method)
 );