Merge commit 'release-3.0-RC7'

author: Nils Adermann <naderman@naderman.de> 2010-03-02 01:05:37 +0100
committer: Nils Adermann <naderman@naderman.de> 2010-03-02 01:05:37 +0100
commit: 8a3c323933cbdadd302ed49b5769f90c3f622cdc (patch)
tree: 8a728061dc1636a1f3ac2a8cc549e2a8395e8e08 /phpBB/install
parent: 54f94e0d428c5963ecca86a40247105e51288432 (diff)
parent: 438f31326a16cbdbc93c46042fa8a7e4e1be0f63 (diff)
download: forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar
forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar.gz
forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar.bz2
forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar.xz
forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.zip
11 files changed, 56 insertions, 40 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 0c060a83dd..91a9951e90 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -31,7 +31,7 @@ unset($dbpasswd);
 */
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
-	'version'		=> '1.0.RC6',
+	'version'		=> '1.0.RC7',
 	'phpbb_version'	=> '3.0.0',
 	'author'		=> '<a href="http://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 9ffd8cae12..4d878b15c0 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,22 @@ $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', ''),
+			),
+			USERS_TABLE			=> array(
+				'user_newpasswd'			=> array('VCHAR_UNI:40', ''),
+			),
+		),
+	),
 );
 
 // Determine mapping database type
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 14f3fb368a..320747b60b 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -321,7 +321,7 @@ class install_update extends module
 					$get_new_list = true;
 				}
 
-				if (!$get_new_list && $update_list['status'] != 'finished')
+				if (!$get_new_list && $update_list['status'] != -1)
 				{
 					$get_new_list = true;
 				}
@@ -332,7 +332,7 @@ class install_update extends module
 					$cache->put('_update_list', $update_list);
 
 					// Refresh the page if we are still not finished...
-					if ($update_list['status'] != 'finished')
+					if ($update_list['status'] != -1)
 					{
 						$refresh_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check");
 						meta_refresh(2, $refresh_url);
@@ -604,9 +604,9 @@ class install_update extends module
 
 				// Before we do anything, let us diff the files and store the raw file information "somewhere"
 				$get_files = false;
-				$file_list = $cache->get('_diff_files');
+				$file_list = false; //$cache->get('_diff_files');
 
-				if ($file_list === false || $file_list['status'] != 'finished')
+				if ($file_list === false || $file_list['status'] != -1)
 				{
 					$get_files = true;
 				}
@@ -747,7 +747,7 @@ class install_update extends module
 					}
 				}
 
-				$file_list['status'] = 'finished';
+				$file_list['status'] = -1;
 				$cache->put('_diff_files', $file_list);
 
 				if (!empty($_REQUEST['download']))
@@ -1187,7 +1187,7 @@ class install_update extends module
 
 		$template->assign_vars(array(
 			'DIFF_CONTENT'			=> $renderer->get_diff_content($diff),
-			'DIFF_MODE'			=> $diff_mode,
+			'DIFF_MODE'				=> $diff_mode,
 			'S_DIFF_MODE_OPTIONS'	=> $diff_mode_options,
 			'S_SHOW_DIFF'			=> true,
 		));
@@ -1291,7 +1291,7 @@ class install_update extends module
 			$update_list['status']++;
 		}
 
-		$update_list['status'] = 'finished';
+		$update_list['status'] = -1;
 /*		if (!sizeof($this->update_info['files']))
 		{
 			return $update_list;
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 95123f9c18..686c59184b 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,
@@ -1354,7 +1354,7 @@ CREATE TABLE phpbb_users (
 	user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	user_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	user_actkey VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	user_newpasswd VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
+	user_newpasswd VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE
 );;
 
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index ccb6b2ea7b..804a970013 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 ,
@@ -1621,7 +1621,7 @@ CREATE TABLE [phpbb_users] (
 	[user_occ] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[user_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[user_actkey] [varchar] (32) DEFAULT ('') NOT NULL ,
-	[user_newpasswd] [varchar] (32) DEFAULT ('') NOT NULL ,
+	[user_newpasswd] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL 
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 1e5faf7c63..a4f617209b 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,
@@ -954,7 +954,7 @@ CREATE TABLE phpbb_users (
 	user_occ blob NOT NULL,
 	user_interests blob NOT NULL,
 	user_actkey varbinary(32) DEFAULT '' NOT NULL,
-	user_newpasswd varbinary(96) DEFAULT '' NOT NULL,
+	user_newpasswd varbinary(120) DEFAULT '' NOT NULL,
 	user_form_salt varbinary(96) DEFAULT '' NOT NULL,
 	PRIMARY KEY (user_id),
 	KEY user_birthday (user_birthday),
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index ade22d4f84..618b98b280 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,
@@ -954,7 +954,7 @@ CREATE TABLE phpbb_users (
 	user_occ text NOT NULL,
 	user_interests text NOT NULL,
 	user_actkey varchar(32) DEFAULT '' NOT NULL,
-	user_newpasswd varchar(32) DEFAULT '' NOT NULL,
+	user_newpasswd varchar(40) DEFAULT '' NOT NULL,
 	user_form_salt varchar(32) DEFAULT '' NOT NULL,
 	PRIMARY KEY (user_id),
 	KEY user_birthday (user_birthday),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 8e327150be..275de3d488 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,
@@ -1771,7 +1771,7 @@ CREATE TABLE phpbb_users (
 	user_occ clob DEFAULT '' ,
 	user_interests clob DEFAULT '' ,
 	user_actkey varchar2(32) DEFAULT '' ,
-	user_newpasswd varchar2(96) DEFAULT '' ,
+	user_newpasswd varchar2(120) DEFAULT '' ,
 	user_form_salt varchar2(96) DEFAULT '' ,
 	CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id),
 	CONSTRAINT u_phpbb_username_clean UNIQUE (username_clean)
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d642227cc9..34ebe22742 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,
@@ -1217,7 +1217,7 @@ CREATE TABLE phpbb_users (
 	user_occ varchar(4000) DEFAULT '' NOT NULL,
 	user_interests varchar(4000) DEFAULT '' NOT NULL,
 	user_actkey varchar(32) DEFAULT '' NOT NULL,
-	user_newpasswd varchar(32) DEFAULT '' NOT NULL,
+	user_newpasswd varchar(40) DEFAULT '' NOT NULL,
 	user_form_salt varchar(32) DEFAULT '' NOT NULL,
 	PRIMARY KEY (user_id)
 );
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 64f947783c..eb333b7e5a 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -172,8 +172,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5'
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars', '3');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars', '6');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_author_chars', '3');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_reg', '5');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_terms', '2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_reg', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_terms', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ANY');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
@@ -213,7 +213,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC6');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC7');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index a30406e968..5e2d28b5bc 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',
@@ -924,7 +924,7 @@ CREATE TABLE phpbb_users (
 	user_occ text(65535) NOT NULL DEFAULT '',
 	user_interests text(65535) NOT NULL DEFAULT '',
 	user_actkey varchar(32) NOT NULL DEFAULT '',
-	user_newpasswd varchar(32) NOT NULL DEFAULT '',
+	user_newpasswd varchar(40) NOT NULL DEFAULT '',
 	user_form_salt varchar(32) NOT NULL DEFAULT ''
 );
author	Nils Adermann <naderman@naderman.de>	2010-03-02 01:05:37 +0100
committer	Nils Adermann <naderman@naderman.de>	2010-03-02 01:05:37 +0100
commit	8a3c323933cbdadd302ed49b5769f90c3f622cdc (patch)
tree	8a728061dc1636a1f3ac2a8cc549e2a8395e8e08 /phpBB/install
parent	54f94e0d428c5963ecca86a40247105e51288432 (diff)
parent	438f31326a16cbdbc93c46042fa8a7e4e1be0f63 (diff)
download	forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar.gz forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar.bz2 forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.tar.xz forums-8a3c323933cbdadd302ed49b5769f90c3f622cdc.zip