From 8126ad0225e8735966e4fe456f7adcda96c54e32 Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 3 Nov 2011 17:51:54 +0000 Subject: - Fix redundant line break in flowed format (#1488146) git-svn-id: https://svn.roundcube.net/trunk@5388 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/CHANGELOG | 1 + roundcubemail/program/steps/mail/func.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index fa4b0a582..6bc7233bf 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix redundant line break in flowed format (#1488146) - TinyMCE: - updated to 3.4.6 - security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 69724c554..39c25f19c 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -766,7 +766,7 @@ function rcmail_plain_body($body, $flowed=false) // previous line is flowed? if (isset($body[$last]) && $body[$n] - && $last != $last_sig + && $last !== $last_sig && $body[$last][strlen($body[$last])-1] == ' ' ) { $body[$last] .= $body[$n]; -- cgit v1.2.3