aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-14 15:46:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-14 15:46:44 +0000
commit1fb304c5f212c6e26a06363805950fe453f0c9c2 (patch)
tree1e86238d97b5c9d1193a6d255d12db76b56e85db /phpBB/install
parentba5c1f9b5f9d574bd88161da9195d7c7e3bd3cc1 (diff)
downloadforums-1fb304c5f212c6e26a06363805950fe453f0c9c2.tar
forums-1fb304c5f212c6e26a06363805950fe453f0c9c2.tar.gz
forums-1fb304c5f212c6e26a06363805950fe453f0c9c2.tar.bz2
forums-1fb304c5f212c6e26a06363805950fe453f0c9c2.tar.xz
forums-1fb304c5f212c6e26a06363805950fe453f0c9c2.zip
more fixes...
git-svn-id: file:///svn/phpbb/trunk@8183 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/database_update.php3
-rw-r--r--phpBB/install/install_update.php2
-rw-r--r--phpBB/install/schemas/firebird_schema.sql2
-rw-r--r--phpBB/install/schemas/mssql_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql2
-rw-r--r--phpBB/install/schemas/oracle_schema.sql2
-rw-r--r--phpBB/install/schemas/postgres_schema.sql2
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql2
9 files changed, 11 insertions, 8 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 122073ba42..4d878b15c0 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -458,6 +458,9 @@ $database_update_info = array(
GROUPS_TABLE => array(
'group_desc_uid' => array('VCHAR:8', ''),
),
+ USERS_TABLE => array(
+ 'user_newpasswd' => array('VCHAR_UNI:40', ''),
+ ),
),
),
);
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 14f3fb368a..36cb806ca6 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -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,
));
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index ba8e8dddb6..686c59184b 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -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 2b99abed4b..804a970013 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -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 2f9e1acc3e..a4f617209b 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -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 e085017bc2..618b98b280 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -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 25e43a486a..275de3d488 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -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 64d4404b93..34ebe22742 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -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/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 490441fcaa..5e2d28b5bc 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -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 ''
);
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-24 03:16:32 +0000