diff options
| author | alecpl <alec@alec.pl> | 2010-03-28 16:51:20 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-03-28 16:51:20 +0000 |
| commit | ce467384e263d459f70915742baccc87c2aa9b79 (patch) | |
| tree | c11ba5bf95fc8b5c77c484703699e8d295c272bd /program | |
| parent | c854241cc4f2a32321ec1fe03c49e54a718e4fc7 (diff) | |
- Fix single space inserted on fwd/reply with top posting (#1486532)
Diffstat (limited to 'program')
| -rw-r--r-- | program/steps/mail/compose.inc | 12 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index d886801a3..07659307c 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -610,17 +610,17 @@ function rcmail_create_reply_body($body, $bodyIsHtml) $body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map); // build reply (quote content) - $prefix = sprintf("On %s, %s wrote:<br />\n", + $prefix = sprintf("<p>On %s, %s wrote:</p>\n", $MESSAGE->headers->date, htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $RCMAIL->output->get_charset())); $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">'; - + if ($RCMAIL->config->get('top_posting')) { - $prefix = "<p></p>" . $prefix; - $suffix = "</blockquote>"; + $prefix = '<br>' . $prefix; + $suffix = '</blockquote>'; } else { - $suffix = "</blockquote><p></p>"; + $suffix = '</blockquote><p></p>'; } } @@ -659,7 +659,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml) $body = rcmail_wash_html($body, array('safe' => $MESSAGE->is_safe), $cid_map); $prefix = sprintf( - "<p></p><p>-------- Original Message --------</p>" . + "<br /><p>-------- Original Message --------</p>" . "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" . "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" . "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" . diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 8edd9df8a..93a595602 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -629,7 +629,7 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) 'cid_map' => $cid_replaces, 'html_elements' => array('body'), ); - + if (!$p['inline_html']) { $wash_opts['html_elements'] = array('html','head','title','body'); } |