diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-15 17:32:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-15 17:32:48 +0000 |
| commit | 2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169 (patch) | |
| tree | 3dbeba19d89b737a07cf7cc23b8c4693d35234ea /phpBB/includes/functions_messenger.php | |
| parent | 3ada3b76f0ce86274647758db029d84a0f404886 (diff) | |
| download | forums-2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169.tar forums-2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169.tar.gz forums-2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169.tar.bz2 forums-2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169.tar.xz forums-2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169.zip | |
some bugs fixed
git-svn-id: file:///svn/phpbb/trunk@8033 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index cbc6dc5031..735588ce21 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -399,12 +399,12 @@ class messenger if ($config['smtp_delivery']) { - $result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap($this->msg), $err_msg, $headers); + $result = smtpmail($this->addresses, mail_encode($this->subject), utf8_wordwrap($this->msg), $err_msg, $headers); } else { ob_start(); - $result = $config['email_function_name']($mail_to, mail_encode($this->subject), implode("\n", preg_split("/\r?\n/", wordwrap($this->msg))), $headers); + $result = $config['email_function_name']($mail_to, mail_encode($this->subject), utf8_wordwrap($this->msg), $headers); $err_msg = ob_get_clean(); } @@ -633,12 +633,12 @@ class queue if ($config['smtp_delivery']) { - $result = smtpmail($addresses, mail_encode($subject), wordwrap($msg), $err_msg, $headers); + $result = smtpmail($addresses, mail_encode($subject), utf8_wordwrap($msg), $err_msg, $headers); } else { ob_start(); - $result = $config['email_function_name']($to, mail_encode($subject), implode("\n", preg_split("/\r?\n/", wordwrap($msg))), $headers); + $result = $config['email_function_name']($to, mail_encode($subject), utf8_wordwrap($msg), $headers); $err_msg = ob_get_clean(); } |