makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

more fixes...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8183 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-10-14 15:46:44 +00:00
parent ba5c1f9b5f
commit 1fb304c5f2
12 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/develop/create_schema_files.php
View file

@ -1841,7 +1841,7 @@ function get_schema_struct()
'user_occ' => array('TEXT_UNI', ''), 'user_occ' => array('TEXT_UNI', ''),
'user_interests' => array('TEXT_UNI', ''), 'user_interests' => array('TEXT_UNI', ''),
'user_actkey' => array('VCHAR:32', ''), 'user_actkey' => array('VCHAR:32', ''),
'user_newpasswd' => array('VCHAR_UNI:32', ''), 'user_newpasswd' => array('VCHAR_UNI:40', ''),
'user_form_salt' => array('VCHAR_UNI:32', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''),
), ),

2
phpBB/docs/CHANGELOG.html
View file

@ -85,7 +85,7 @@
<li>[Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions</li> <li>[Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions</li>
<li>[Fix] Fixed faulty form token for acp_ranks (Bug #14736)</li> <li>[Fix] Fixed faulty form token for acp_ranks (Bug #14736)</li>
<li>[Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)</li> <li>[Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)</li>
<li>[Fix] Able to request new password (Bug #14743)</li>
</ul> </ul>

5
phpBB/includes/acp/acp_language.php
View file

@ -1171,6 +1171,11 @@ class acp_language
/** /**
* DO NOT CHANGE * DO NOT CHANGE
*/ */
if (!defined(\'IN_PHPBB\'))
{
exit;
}
if (empty($lang) || !is_array($lang)) if (empty($lang) || !is_array($lang))
{ {
$lang = array(); $lang = array();

3
phpBB/install/database_update.php
View file

@ -458,6 +458,9 @@ $database_update_info = array(
GROUPS_TABLE => array( GROUPS_TABLE => array(
'group_desc_uid' => array('VCHAR:8', ''), 'group_desc_uid' => array('VCHAR:8', ''),
), ),
USERS_TABLE => array(
'user_newpasswd' => array('VCHAR_UNI:40', ''),
),
), ),
), ),
); );

2
phpBB/install/install_update.php
View file

@ -1187,7 +1187,7 @@ class install_update extends module
$template->assign_vars(array( $template->assign_vars(array(
'DIFF_CONTENT' => $renderer->get_diff_content($diff), 'DIFF_CONTENT' => $renderer->get_diff_content($diff),
'DIFF_MODE' => $diff_mode, 'DIFF_MODE' => $diff_mode,
'S_DIFF_MODE_OPTIONS' => $diff_mode_options, 'S_DIFF_MODE_OPTIONS' => $diff_mode_options,
'S_SHOW_DIFF' => true, 'S_SHOW_DIFF' => true,
)); ));

2
phpBB/install/schemas/firebird_schema.sql
View file

@ -1354,7 +1354,7 @@ CREATE TABLE phpbb_users (
user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, 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_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
user_actkey VARCHAR(32) CHARACTER SET NONE 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 user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE
);; );;

2
phpBB/install/schemas/mssql_schema.sql
View file

@ -1621,7 +1621,7 @@ CREATE TABLE [phpbb_users] (
[user_occ] [varchar] (4000) DEFAULT ('') NOT NULL , [user_occ] [varchar] (4000) DEFAULT ('') NOT NULL ,
[user_interests] [varchar] (4000) DEFAULT ('') NOT NULL , [user_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,
[user_actkey] [varchar] (32) 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 [user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO GO

2
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -954,7 +954,7 @@ CREATE TABLE phpbb_users (
user_occ blob NOT NULL, user_occ blob NOT NULL,
user_interests blob NOT NULL, user_interests blob NOT NULL,
user_actkey varbinary(32) DEFAULT '' 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, user_form_salt varbinary(96) DEFAULT '' NOT NULL,
PRIMARY KEY (user_id), PRIMARY KEY (user_id),
KEY user_birthday (user_birthday), KEY user_birthday (user_birthday),

2
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -954,7 +954,7 @@ CREATE TABLE phpbb_users (
user_occ text NOT NULL, user_occ text NOT NULL,
user_interests text NOT NULL, user_interests text NOT NULL,
user_actkey varchar(32) 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, user_form_salt varchar(32) DEFAULT '' NOT NULL,
PRIMARY KEY (user_id), PRIMARY KEY (user_id),
KEY user_birthday (user_birthday), KEY user_birthday (user_birthday),

2
phpBB/install/schemas/oracle_schema.sql
View file

@ -1771,7 +1771,7 @@ CREATE TABLE phpbb_users (
user_occ clob DEFAULT '' , user_occ clob DEFAULT '' ,
user_interests clob DEFAULT '' , user_interests clob DEFAULT '' ,
user_actkey varchar2(32) DEFAULT '' , user_actkey varchar2(32) DEFAULT '' ,
user_newpasswd varchar2(96) DEFAULT '' , user_newpasswd varchar2(120) DEFAULT '' ,
user_form_salt varchar2(96) DEFAULT '' , user_form_salt varchar2(96) DEFAULT '' ,
CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id), CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id),
CONSTRAINT u_phpbb_username_clean UNIQUE (username_clean) CONSTRAINT u_phpbb_username_clean UNIQUE (username_clean)

2
phpBB/install/schemas/postgres_schema.sql
View file

@ -1217,7 +1217,7 @@ CREATE TABLE phpbb_users (
user_occ varchar(4000) DEFAULT '' NOT NULL, user_occ varchar(4000) DEFAULT '' NOT NULL,
user_interests varchar(4000) DEFAULT '' NOT NULL, user_interests varchar(4000) DEFAULT '' NOT NULL,
user_actkey varchar(32) 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, user_form_salt varchar(32) DEFAULT '' NOT NULL,
PRIMARY KEY (user_id) PRIMARY KEY (user_id)
); );

2
phpBB/install/schemas/sqlite_schema.sql
View file

@ -924,7 +924,7 @@ CREATE TABLE phpbb_users (
user_occ text(65535) NOT NULL DEFAULT '', user_occ text(65535) NOT NULL DEFAULT '',
user_interests text(65535) NOT NULL DEFAULT '', user_interests text(65535) NOT NULL DEFAULT '',
user_actkey varchar(32) 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 '' user_form_salt varchar(32) NOT NULL DEFAULT ''
); );