forum rules, forum descriptions and group description bbcode uid fixes

git-svn-id: file:///svn/phpbb/trunk@8178 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2007-10-14 12:12:32 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2007-10-14 12:12:32 +0000
commit: ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e (patch)
tree: 60a4b7d38f328a0e04083bfc0853c496c8981902 /phpBB/install
parent: 525b9bd79961041e3e095fa98eb1e8e57eaa2a7b (diff)
download: forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar
forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar.gz
forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar.bz2
forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar.xz
forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.zip
8 files changed, 35 insertions, 22 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9ffd8cae12..122073ba42 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.RC6';
+$updates_to_version = '3.0.RC7';
 
 // Return if we "just include it" to find out for which version the database update is responsuble for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
@@ -447,6 +447,19 @@ $database_update_info = array(
 			),
 		),
 	),
+	// Changes from 3.0.RC6 to the next version
+	'3.0.RC6'			=> array(
+		// Change the following columns
+		'change_columns'		=> array(
+			FORUMS_TABLE				=> array(
+				'forum_desc_uid'		=> array('VCHAR:8', ''),
+				'forum_rules_uid'		=> array('VCHAR:8', ''),
+			),
+			GROUPS_TABLE		=> array(
+				'group_desc_uid'		=> array('VCHAR:8', ''),
+			),
+		),
+	),
 );
 
 // Determine mapping database type
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 95123f9c18..ba8e8dddb6 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -339,7 +339,7 @@ CREATE TABLE phpbb_forums (
 	forum_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	forum_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	forum_desc_options INTEGER DEFAULT 7 NOT NULL,
-	forum_desc_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	forum_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	forum_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	forum_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	forum_style INTEGER DEFAULT 0 NOT NULL,
@@ -348,7 +348,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	forum_rules_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	forum_rules_options INTEGER DEFAULT 7 NOT NULL,
-	forum_rules_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	forum_rules_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	forum_topics_per_page INTEGER DEFAULT 0 NOT NULL,
 	forum_type INTEGER DEFAULT 0 NOT NULL,
 	forum_status INTEGER DEFAULT 0 NOT NULL,
@@ -428,7 +428,7 @@ CREATE TABLE phpbb_groups (
 	group_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	group_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_desc_options INTEGER DEFAULT 7 NOT NULL,
-	group_desc_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL,
+	group_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_display INTEGER DEFAULT 0 NOT NULL,
 	group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_avatar_type INTEGER DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index ccb6b2ea7b..2b99abed4b 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -415,7 +415,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_desc] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[forum_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_desc_options] [int] DEFAULT (7) NOT NULL ,
-	[forum_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
+	[forum_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[forum_link] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_password] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[forum_style] [int] DEFAULT (0) NOT NULL ,
@@ -424,7 +424,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_rules_link] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_rules_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_rules_options] [int] DEFAULT (7) NOT NULL ,
-	[forum_rules_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
+	[forum_rules_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[forum_topics_per_page] [int] DEFAULT (0) NOT NULL ,
 	[forum_type] [int] DEFAULT (0) NOT NULL ,
 	[forum_status] [int] DEFAULT (0) NOT NULL ,
@@ -533,7 +533,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_desc] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[group_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[group_desc_options] [int] DEFAULT (7) NOT NULL ,
-	[group_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
+	[group_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[group_display] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[group_avatar_type] [int] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 1e5faf7c63..2f9e1acc3e 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -225,7 +225,7 @@ CREATE TABLE phpbb_forums (
 	forum_desc blob NOT NULL,
 	forum_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	forum_desc_uid varbinary(5) DEFAULT '' NOT NULL,
+	forum_desc_uid varbinary(8) DEFAULT '' NOT NULL,
 	forum_link blob NOT NULL,
 	forum_password varbinary(120) DEFAULT '' NOT NULL,
 	forum_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
@@ -234,7 +234,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules_link blob NOT NULL,
 	forum_rules_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	forum_rules_uid varbinary(5) DEFAULT '' NOT NULL,
+	forum_rules_uid varbinary(8) DEFAULT '' NOT NULL,
 	forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
 	forum_type tinyint(4) DEFAULT '0' NOT NULL,
 	forum_status tinyint(4) DEFAULT '0' NOT NULL,
@@ -300,7 +300,7 @@ CREATE TABLE phpbb_groups (
 	group_desc blob NOT NULL,
 	group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
 	group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	group_desc_uid varbinary(5) DEFAULT '' NOT NULL,
+	group_desc_uid varbinary(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varbinary(255) DEFAULT '' NOT NULL,
 	group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index ade22d4f84..e085017bc2 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -225,7 +225,7 @@ CREATE TABLE phpbb_forums (
 	forum_desc text NOT NULL,
 	forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
 	forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
+	forum_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	forum_link varchar(255) DEFAULT '' NOT NULL,
 	forum_password varchar(40) DEFAULT '' NOT NULL,
 	forum_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
@@ -234,7 +234,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
+	forum_rules_uid varchar(8) DEFAULT '' NOT NULL,
 	forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
 	forum_type tinyint(4) DEFAULT '0' NOT NULL,
 	forum_status tinyint(4) DEFAULT '0' NOT NULL,
@@ -300,7 +300,7 @@ CREATE TABLE phpbb_groups (
 	group_desc text NOT NULL,
 	group_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
 	group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
-	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
+	group_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
 	group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8e327150be..25e43a486a 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -482,7 +482,7 @@ CREATE TABLE phpbb_forums (
 	forum_desc clob DEFAULT '' ,
 	forum_desc_bitfield varchar2(255) DEFAULT '' ,
 	forum_desc_options number(11) DEFAULT '7' NOT NULL,
-	forum_desc_uid varchar2(5) DEFAULT '' ,
+	forum_desc_uid varchar2(8) DEFAULT '' ,
 	forum_link varchar2(765) DEFAULT '' ,
 	forum_password varchar2(120) DEFAULT '' ,
 	forum_style number(4) DEFAULT '0' NOT NULL,
@@ -491,7 +491,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules_link varchar2(765) DEFAULT '' ,
 	forum_rules_bitfield varchar2(255) DEFAULT '' ,
 	forum_rules_options number(11) DEFAULT '7' NOT NULL,
-	forum_rules_uid varchar2(5) DEFAULT '' ,
+	forum_rules_uid varchar2(8) DEFAULT '' ,
 	forum_topics_per_page number(4) DEFAULT '0' NOT NULL,
 	forum_type number(4) DEFAULT '0' NOT NULL,
 	forum_status number(4) DEFAULT '0' NOT NULL,
@@ -590,7 +590,7 @@ CREATE TABLE phpbb_groups (
 	group_desc clob DEFAULT '' ,
 	group_desc_bitfield varchar2(255) DEFAULT '' ,
 	group_desc_options number(11) DEFAULT '7' NOT NULL,
-	group_desc_uid varchar2(5) DEFAULT '' ,
+	group_desc_uid varchar2(8) DEFAULT '' ,
 	group_display number(1) DEFAULT '0' NOT NULL,
 	group_avatar varchar2(255) DEFAULT '' ,
 	group_avatar_type number(2) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d642227cc9..64d4404b93 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -358,7 +358,7 @@ CREATE TABLE phpbb_forums (
 	forum_desc varchar(4000) DEFAULT '' NOT NULL,
 	forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
 	forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0),
-	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
+	forum_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	forum_link varchar(255) DEFAULT '' NOT NULL,
 	forum_password varchar(40) DEFAULT '' NOT NULL,
 	forum_style INT2 DEFAULT '0' NOT NULL CHECK (forum_style >= 0),
@@ -367,7 +367,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_options INT4 DEFAULT '7' NOT NULL CHECK (forum_rules_options >= 0),
-	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
+	forum_rules_uid varchar(8) DEFAULT '' NOT NULL,
 	forum_topics_per_page INT2 DEFAULT '0' NOT NULL,
 	forum_type INT2 DEFAULT '0' NOT NULL,
 	forum_status INT2 DEFAULT '0' NOT NULL,
@@ -443,7 +443,7 @@ CREATE TABLE phpbb_groups (
 	group_desc varchar(4000) DEFAULT '' NOT NULL,
 	group_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
 	group_desc_options INT4 DEFAULT '7' NOT NULL CHECK (group_desc_options >= 0),
-	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
+	group_desc_uid varchar(8) DEFAULT '' NOT NULL,
 	group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
 	group_avatar_type INT2 DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index a30406e968..490441fcaa 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -218,7 +218,7 @@ CREATE TABLE phpbb_forums (
 	forum_desc text(65535) NOT NULL DEFAULT '',
 	forum_desc_bitfield varchar(255) NOT NULL DEFAULT '',
 	forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
-	forum_desc_uid varchar(5) NOT NULL DEFAULT '',
+	forum_desc_uid varchar(8) NOT NULL DEFAULT '',
 	forum_link varchar(255) NOT NULL DEFAULT '',
 	forum_password varchar(40) NOT NULL DEFAULT '',
 	forum_style INTEGER UNSIGNED NOT NULL DEFAULT '0',
@@ -227,7 +227,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules_link varchar(255) NOT NULL DEFAULT '',
 	forum_rules_bitfield varchar(255) NOT NULL DEFAULT '',
 	forum_rules_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
-	forum_rules_uid varchar(5) NOT NULL DEFAULT '',
+	forum_rules_uid varchar(8) NOT NULL DEFAULT '',
 	forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0',
 	forum_type tinyint(4) NOT NULL DEFAULT '0',
 	forum_status tinyint(4) NOT NULL DEFAULT '0',
@@ -292,7 +292,7 @@ CREATE TABLE phpbb_groups (
 	group_desc text(65535) NOT NULL DEFAULT '',
 	group_desc_bitfield varchar(255) NOT NULL DEFAULT '',
 	group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
-	group_desc_uid varchar(5) NOT NULL DEFAULT '',
+	group_desc_uid varchar(8) NOT NULL DEFAULT '',
 	group_display INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar varchar(255) NOT NULL DEFAULT '',
 	group_avatar_type tinyint(2) NOT NULL DEFAULT '0',
author	Meik Sievertsen <acydburn@phpbb.com>	2007-10-14 12:12:32 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2007-10-14 12:12:32 +0000
commit	ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e (patch)
tree	60a4b7d38f328a0e04083bfc0853c496c8981902 /phpBB/install
parent	525b9bd79961041e3e095fa98eb1e8e57eaa2a7b (diff)
download	forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar.gz forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar.bz2 forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.tar.xz forums-ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e.zip