diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-06 16:41:43 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-06 16:41:43 +0000 |
| commit | 1c8899f918d18ae9c67035cbb65f995320ee11fb (patch) | |
| tree | ff743a79809347fed22ff8a3eb97db72e66311d4 /roundcubemail/program/steps/mail/compose.inc | |
| parent | 7d3e6dbdb8bbabc297c37095b8a9a35b54107c10 (diff) | |
Don't wrap worwarded text; better wrap reply message text
git-svn-id: https://svn.roundcube.net/trunk@1751 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/compose.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index 783ac98ef..0a5226e66 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -32,7 +32,7 @@ if ($RCMAIL->action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_ if (is_array($_SESSION['compose']['attachments'][$id])) { @unlink($_SESSION['compose']['attachments'][$id]['path']); - $_SESSION['compose']['attachments'][$id] = NULL; + unset($_SESSION['compose']['attachments'][$id]); $OUTPUT->command('remove_from_attachment_list', "rcmfile$id"); $OUTPUT->send(); exit; @@ -478,7 +478,7 @@ function rcmail_create_reply_body($body, $bodyIsHtml) if (! $bodyIsHtml) { // soft-wrap message first - $body = wordwrap($body, 75); + $body = rcmail_wrap_quoted($body, 75); // split body into single lines $a_lines = preg_split('/\r?\n/', $body); @@ -526,9 +526,6 @@ function rcmail_create_forward_body($body, $bodyIsHtml) if (!$bodyIsHtml) { - // soft-wrap message first - $body = wordwrap($body, 80); - $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n", $MESSAGE->subject, $MESSAGE->headers->date, |