From aa38c512fb7634f51bfa168476105dd071f4bd35 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 8 Apr 2015 21:04:04 +0200 Subject: Fix lack of signature separator for plain text signatures in html mode (#1490352) --- CHANGELOG | 1 + program/steps/mail/compose.inc | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6dbbecf7a..37c41b134 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail - Fix message list header in classic skin on window resize in Internet Explorer (#1490213) - Fix so text/calendar parts are listed as attachments even if not marked as such (#1490325) - Fix so unrecognized TNEF attachments are displayed on the list of attachments (#1490351) +- Fix lack of signature separator for plain text signatures in html mode (#1490352) RELEASE 1.1.1 ------------- diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 007efc5f3..ba6f334c9 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -628,11 +628,12 @@ function rcmail_compose_header_from($attrib) $text = $html = $sql_arr['signature']; if ($sql_arr['html_signature']) { - $h2t = new rcube_html2text($sql_arr['signature'], false, true); + $h2t = new rcube_html2text($html, false, true); $text = trim($h2t->get_text()); } else { - $html = htmlentities($html, ENT_NOQUOTES, RCUBE_CHARSET); + $t2h = new rcube_text2html($text, false); + $html = $t2h->get_html(); } if (!preg_match('/^--[ -]\r?\n/m', $text)) { @@ -640,11 +641,6 @@ function rcmail_compose_header_from($attrib) $html = $separator . "
" . $html; } - if (!$sql_arr['html_signature']) { - $t2h = new rcube_text2html($sql_arr['signature'], false); - $html = $t2h->get_html(); - } - $a_signatures[$identity_id]['text'] = $text; $a_signatures[$identity_id]['html'] = $html; } -- cgit v1.2.3