mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/emailer.php
View File

@@ -151,7 +151,7 @@ class emailer
$this->msg = ( isset($match[5]) ) ? trim($match[5]) : '';
$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;
}
@@ -209,7 +209,7 @@ class emailer
{
$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)
{
@@ -305,4 +305,4 @@ class emailer
} // class emailer
?>
?>