9 files changed, 30 insertions, 90 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index ec93b19844..a761ae7bfa 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -1322,7 +1322,7 @@ function get_schema_struct()
 			'message_edit_user'		=> array('UINT', 0),
 			'message_attachment'	=> array('BOOL', 0),
 			'bbcode_bitfield'		=> array('VCHAR:255', ''),
-			'bbcode_uid'			=> array('VCHAR:5', ''),
+			'bbcode_uid'			=> array('VCHAR:8', ''),
 			'message_edit_time'		=> array('TIMESTAMP', 0),
 			'message_edit_count'	=> array('USINT', 0),
 			'to_address'			=> array('TEXT_UNI', ''),
@@ -1829,7 +1829,7 @@ function get_schema_struct()
 			'user_avatar_width'			=> array('USINT', 0),
 			'user_avatar_height'		=> array('USINT', 0),
 			'user_sig'					=> array('MTEXT_UNI', ''),
-			'user_sig_bbcode_uid'		=> array('VCHAR:5', ''),
+			'user_sig_bbcode_uid'		=> array('VCHAR:8', ''),
 			'user_sig_bbcode_bitfield'	=> array('VCHAR:255', ''),
 			'user_from'					=> array('VCHAR_UNI:100', ''),
 			'user_icq'					=> array('VCHAR:15', ''),
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a7713f8e34..5cc8bd114f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -337,27 +337,6 @@ $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
 
 // Only an example, but also commented out
 $database_update_info = array(
-	// Changes from 3.0.RC1 to the next version
-	'3.0.RC1'			=> array(
-		// Remove the following keys
-		'drop_keys'		=> array(
-			STYLES_IMAGESET_DATA_TABLE	=> array(
-				'i_id',
-			),
-			ACL_ROLES_DATA_TABLE		=> array(
-				'ath_opt_id',
-			),
-		),
-		// Add the following keys
-		'add_index'		=> array(
-			STYLES_IMAGESET_DATA_TABLE	=> array(
-				'i_d'			=> array('imageset_id'),
-			),
-			ACL_ROLES_DATA_TABLE		=> array(
-				'ath_opt_id'	=> array('auth_option_id'),
-			),
-		),
-	),
 	// Changes from 3.0.RC2 to the next version
 	'3.0.RC2'			=> array(
 		// Change the following columns
@@ -458,7 +437,13 @@ $database_update_info = array(
 		// Change the following columns
 		'change_columns'		=> array(
 			POSTS_TABLE				=> array(
-				'bbcode_uid'			=> array('VCHAR_UNI:8', ''),
+				'bbcode_uid'			=> array('VCHAR:8', ''),
+			),
+			PRIVMSGS_TABLE		=> array(
+				'bbcode_uid'			=> array('VCHAR:8', ''),
+			),
+			USERS_TABLE			=> array(
+				'user_sig_bbcode_uid'	=> array('VCHAR:8', ''),
 			),
 		),
 	),
@@ -1160,51 +1145,6 @@ flush();
 $no_updates = true;
 
 // some code magic
-if (version_compare($current_version, '3.0.RC1', '<='))
-{
-	// we have to remove a few extra entries from converted boards.
-	$sql = 'SELECT group_id
-		FROM ' . GROUPS_TABLE . "
-		WHERE group_name = '" . $db->sql_escape('BOTS') . "'";
-	$result = $db->sql_query($sql);
-	$bot_group_id = (int) $db->sql_fetchfield('group_id');
-	$db->sql_freeresult($result);
-
-	$bots = array();
-	$sql = 'SELECT u.user_id
-		FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug
-		WHERE ug.group_id = ' . $bot_group_id . '
-		AND ug.user_id = u.user_id';
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$bots[] = (int)$row['user_id'];
-	}
-	$db->sql_freeresult($result);
-	
-	if (sizeof($bots))
-	{
-		$sql = 'DELETE FROM ' . USER_GROUP_TABLE . "
-			WHERE group_id <> $bot_group_id
-				AND " . $db->sql_in_set('user_id', $bots);
-		$db->sql_query($sql);
-	}
-
-	if ($map_dbms === 'mysql_41')
-	{
-		sql_column_change($map_dbms, POSTS_TABLE, 'post_subject', array('XSTEXT_UNI', '', 'true_sort'));
-	}
-
-	$sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'jab_resource'";
-	_sql($sql, $errored, $error_ary);
-
-	set_config('jab_use_ssl', '0');
-	set_config('allow_post_flash', '1');
-
-	$no_updates = false;
-}
-
 if (version_compare($current_version, '3.0.RC2', '<='))
 {
 	$smileys = array();
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 0239279bed..95123f9c18 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -676,7 +676,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user INTEGER DEFAULT 0 NOT NULL,
 	message_attachment INTEGER DEFAULT 0 NOT NULL,
 	bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	bbcode_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	bbcode_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	message_edit_time INTEGER DEFAULT 0 NOT NULL,
 	message_edit_count INTEGER DEFAULT 0 NOT NULL,
 	to_address BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
@@ -1342,7 +1342,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	user_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
-	user_sig_bbcode_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	user_sig_bbcode_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_sig_bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_from VARCHAR(100) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_icq VARCHAR(15) CHARACTER SET NONE DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index a87d6bb801..ccb6b2ea7b 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -820,7 +820,7 @@ CREATE TABLE [phpbb_privmsgs] (
 	[message_edit_user] [int] DEFAULT (0) NOT NULL ,
 	[message_attachment] [int] DEFAULT (0) NOT NULL ,
 	[bbcode_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
+	[bbcode_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[message_edit_time] [int] DEFAULT (0) NOT NULL ,
 	[message_edit_count] [int] DEFAULT (0) NOT NULL ,
 	[to_address] [varchar] (4000) DEFAULT ('') NOT NULL ,
@@ -1609,7 +1609,7 @@ CREATE TABLE [phpbb_users] (
 	[user_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[user_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[user_sig] [text] DEFAULT ('') NOT NULL ,
-	[user_sig_bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
+	[user_sig_bbcode_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[user_sig_bbcode_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_from] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[user_icq] [varchar] (15) DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 0ddca29639..1e5faf7c63 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -476,7 +476,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
-	bbcode_uid varbinary(5) DEFAULT '' NOT NULL,
+	bbcode_uid varbinary(8) DEFAULT '' NOT NULL,
 	message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	message_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	to_address blob NOT NULL,
@@ -942,7 +942,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumblob NOT NULL,
-	user_sig_bbcode_uid varbinary(5) DEFAULT '' NOT NULL,
+	user_sig_bbcode_uid varbinary(8) DEFAULT '' NOT NULL,
 	user_sig_bbcode_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	user_from blob NOT NULL,
 	user_icq varbinary(15) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 0686c6cae7..ade22d4f84 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -476,7 +476,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar(255) DEFAULT '' NOT NULL,
-	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
+	bbcode_uid varchar(8) DEFAULT '' NOT NULL,
 	message_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	message_edit_count smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	to_address text NOT NULL,
@@ -942,7 +942,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumtext NOT NULL,
-	user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL,
+	user_sig_bbcode_uid varchar(8) DEFAULT '' NOT NULL,
 	user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL,
 	user_from varchar(100) DEFAULT '' NOT NULL,
 	user_icq varchar(15) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index d67fa0a854..8e327150be 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -15,17 +15,17 @@
 
 /*
 CREATE TABLESPACE "PHPBB"
-	LOGGING 
-	DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' 
+	LOGGING
+	DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora'
 	SIZE 10M
 	AUTOEXTEND ON NEXT 10M
 	MAXSIZE 100M;
 
-CREATE USER "PHPBB" 
-	PROFILE "DEFAULT" 
-	IDENTIFIED BY "phpbb_password" 
-	DEFAULT TABLESPACE "PHPBB" 
-	QUOTA UNLIMITED ON "PHPBB" 
+CREATE USER "PHPBB"
+	PROFILE "DEFAULT"
+	IDENTIFIED BY "phpbb_password"
+	DEFAULT TABLESPACE "PHPBB"
+	QUOTA UNLIMITED ON "PHPBB"
 	ACCOUNT UNLOCK;
 
 GRANT ANALYZE ANY TO "PHPBB";
@@ -913,7 +913,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user number(8) DEFAULT '0' NOT NULL,
 	message_attachment number(1) DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar2(255) DEFAULT '' ,
-	bbcode_uid varchar2(5) DEFAULT '' ,
+	bbcode_uid varchar2(8) DEFAULT '' ,
 	message_edit_time number(11) DEFAULT '0' NOT NULL,
 	message_edit_count number(4) DEFAULT '0' NOT NULL,
 	to_address clob DEFAULT '' ,
@@ -1759,7 +1759,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_width number(4) DEFAULT '0' NOT NULL,
 	user_avatar_height number(4) DEFAULT '0' NOT NULL,
 	user_sig clob DEFAULT '' ,
-	user_sig_bbcode_uid varchar2(5) DEFAULT '' ,
+	user_sig_bbcode_uid varchar2(8) DEFAULT '' ,
 	user_sig_bbcode_bitfield varchar2(255) DEFAULT '' ,
 	user_from varchar2(300) DEFAULT '' ,
 	user_icq varchar2(15) DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index ddf856ed40..d642227cc9 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -649,7 +649,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user INT4 DEFAULT '0' NOT NULL CHECK (message_edit_user >= 0),
 	message_attachment INT2 DEFAULT '0' NOT NULL CHECK (message_attachment >= 0),
 	bbcode_bitfield varchar(255) DEFAULT '' NOT NULL,
-	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
+	bbcode_uid varchar(8) DEFAULT '' NOT NULL,
 	message_edit_time INT4 DEFAULT '0' NOT NULL CHECK (message_edit_time >= 0),
 	message_edit_count INT2 DEFAULT '0' NOT NULL CHECK (message_edit_count >= 0),
 	to_address varchar(4000) DEFAULT '' NOT NULL,
@@ -1205,7 +1205,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_width INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_width >= 0),
 	user_avatar_height INT2 DEFAULT '0' NOT NULL CHECK (user_avatar_height >= 0),
 	user_sig TEXT DEFAULT '' NOT NULL,
-	user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL,
+	user_sig_bbcode_uid varchar(8) DEFAULT '' NOT NULL,
 	user_sig_bbcode_bitfield varchar(255) DEFAULT '' NOT NULL,
 	user_from varchar(100) DEFAULT '' NOT NULL,
 	user_icq varchar(15) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 81f9f4bd03..a30406e968 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -462,7 +462,7 @@ CREATE TABLE phpbb_privmsgs (
 	message_edit_user INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	message_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_bitfield varchar(255) NOT NULL DEFAULT '',
-	bbcode_uid varchar(5) NOT NULL DEFAULT '',
+	bbcode_uid varchar(8) NOT NULL DEFAULT '',
 	message_edit_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	message_edit_count INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	to_address text(65535) NOT NULL DEFAULT '',
@@ -912,7 +912,7 @@ CREATE TABLE phpbb_users (
 	user_avatar_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_avatar_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_sig mediumtext(16777215) NOT NULL DEFAULT '',
-	user_sig_bbcode_uid varchar(5) NOT NULL DEFAULT '',
+	user_sig_bbcode_uid varchar(8) NOT NULL DEFAULT '',
 	user_sig_bbcode_bitfield varchar(255) NOT NULL DEFAULT '',
 	user_from varchar(100) NOT NULL DEFAULT '',
 	user_icq varchar(15) NOT NULL DEFAULT '',