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

Ok, so many bug fixes, so little time... Fun... Well, the change to

Browse source 
mysql_schema was just changing the phpbb_groups group_id to auto
increment, should fix problems in upgrade.php.  Should.  I will probably
include any relevant schema changes with a nice update_to script in 2.0.2
;)


git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2785 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
dougk_ff7 2002-07-29 05:04:04 +00:00
parent 180dac9e87
commit cc6efeb5fd
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/db/schemas/mysql_schema.sql
View file

@ -42,7 +42,7 @@ CREATE TABLE phpbb_user_group (
# Table structure for table 'phpbb_groups' # Table structure for table 'phpbb_groups'
# #
CREATE TABLE phpbb_groups ( CREATE TABLE phpbb_groups (
group_id mediumint(8) NOT NULL, group_id mediumint(8) NOT NULL AUTO INCREMENT,
group_type tinyint(4) DEFAULT '1' NOT NULL, group_type tinyint(4) DEFAULT '1' NOT NULL,
group_name varchar(40) NOT NULL, group_name varchar(40) NOT NULL,
group_description varchar(255) NOT NULL, group_description varchar(255) NOT NULL,

2
phpBB/includes/constants.php
View file

@ -178,4 +178,4 @@ define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results'); define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
define('VOTE_USERS_TABLE', $table_prefix.'vote_voters'); define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
?> ?>

6
phpBB/includes/emailer.php
View file

@ -151,7 +151,7 @@ class emailer
$this->msg = ( isset($match[5]) ) ? trim($match[5]) : ''; $this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
$this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]); $this->subject = ( $this->subject != '' ) ? $this->subject : trim($match[2]);
$this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : 'iso-8859-1'; $this->encoding = ( trim($match[4]) != '' ) ? trim($match[4]) : $lang['ENCODING'];
return true; return true;
} }
@ -209,7 +209,7 @@ class emailer
{ {
$mime_boundary = "--==================_846811060==_"; $mime_boundary = "--==================_846811060==_";
$this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"iso-8859-1\"\n\n" . $this->mailMsg; $this->mailMsg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->mailMsg;
if ($mime_filename) if ($mime_filename)
{ {
@ -305,4 +305,4 @@ class emailer
} // class emailer } // class emailer
?> ?>

1
phpBB/includes/usercp_register.php
View file

@ -659,6 +659,7 @@ if ( $error )
$occupation = htmlspecialchars(stripslashes($occupation)); $occupation = htmlspecialchars(stripslashes($occupation));
$interests = htmlspecialchars(stripslashes($interests)); $interests = htmlspecialchars(stripslashes($interests));
$signature = stripslashes($signature); $signature = stripslashes($signature);
$signature = ( $signature_bbcode_uid != '' ) ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid\]/si", ']', $signature) : $signature;
$user_lang = stripslashes($user_lang); $user_lang = stripslashes($user_lang);
$user_dateformat = stripslashes($user_dateformat); $user_dateformat = stripslashes($user_dateformat);

4
phpBB/memberlist.php
View file

@ -110,7 +110,7 @@ if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
switch( $mode ) switch( $mode )
{ {
case 'joined': case 'joindate':
$order_by = "user_regdate ASC LIMIT $start, " . $board_config['topics_per_page']; $order_by = "user_regdate ASC LIMIT $start, " . $board_config['topics_per_page'];
break; break;
case 'username': case 'username':
@ -305,4 +305,4 @@ $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?> ?>

4
phpBB/upgrade.php
View file

@ -1789,7 +1789,7 @@ if ( !empty($next) )
$sql = "UPDATE " . $table_prefix . "config $sql = "UPDATE " . $table_prefix . "config
SET config_value = '" . $script_path . "' SET config_value = '" . $script_path . "'
WHERE config_name = 'script_path'"; WHERE config_name = 'script_path'";
query($sql, "Couldn't insert Board admin email"); query($sql, "Couldn't insert Board script path");
// //
// Change session table to HEAP if MySQL version matches // Change session table to HEAP if MySQL version matches
@ -1932,4 +1932,4 @@ print "<br />If the upgrade completed without error you may click <a href=\"inde
common_footer(); common_footer();
?> ?>