aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2004-02-02 13:06:18 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2004-02-02 13:06:18 +0000
commit96cbe87fc87bb922a5baef773b22d8cc8581e6e5 (patch)
tree863f35ddea8aba9710f9c616ba153945be61e218 /phpBB
parent56391aa7b8911b14eab514c8fedddcc0f4a110b3 (diff)
downloadforums-96cbe87fc87bb922a5baef773b22d8cc8581e6e5.tar
forums-96cbe87fc87bb922a5baef773b22d8cc8581e6e5.tar.gz
forums-96cbe87fc87bb922a5baef773b22d8cc8581e6e5.tar.bz2
forums-96cbe87fc87bb922a5baef773b22d8cc8581e6e5.tar.xz
forums-96cbe87fc87bb922a5baef773b22d8cc8581e6e5.zip
Wordwrap message
git-svn-id: file:///svn/phpbb/trunk@4778 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_messenger.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 057953d587..de7a71d9e2 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -294,7 +294,8 @@ class messenger
{
$mail_to = ($to == '') ? 'Undisclosed-Recipient:;' : $to;
$err_msg = '';
- $result = ($config['smtp_delivery']) ? smtpmail($this->addresses, $this->subject, $this->msg, $err_msg, $headers, $log_session) : @$config['mail_function_name']($mail_to, $this->subject, implode("\n", preg_split("/\r?\n/", $this->msg)), $headers);
+
+ $result = ($config['smtp_delivery']) ? smtpmail($this->addresses, $this->subject, wordwrap($this->msg), $err_msg, $headers) : @$config['mail_function_name']($mail_to, $this->subject, implode("\n", preg_split("/\r?\n/", wordwrap($this->msg))), $headers);
if (!$result)
{
@@ -498,7 +499,7 @@ class queue
$err_msg = '';
$to = (!$to) ? 'Undisclosed-Recipient:;' : $to;
- $result = ($config['smtp_delivery']) ? smtpmail($addresses, $subject, $msg, $err_msg, $headers, $log_session) : $config['email_function_name']($to, $subject, implode("\n", preg_split("/\r?\n/", $msg)), $headers);
+ $result = ($config['smtp_delivery']) ? smtpmail($addresses, $subject, wordwrap($msg), $err_msg, $headers) : $config['email_function_name']($to, $subject, implode("\n", preg_split("/\r?\n/", wordwrap($msg))), $headers);
if (!$result)
{