diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-03 17:51:54 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-03 17:51:54 +0000 |
| commit | 8126ad0225e8735966e4fe456f7adcda96c54e32 (patch) | |
| tree | b3f5ca291f1805e84adc529f21d9959038052bc7 | |
| parent | fe19ff429067eab046f964414df8187a01e58fdf (diff) | |
- Fix redundant line break in flowed format (#1488146)
git-svn-id: https://svn.roundcube.net/trunk@5388 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 1 deletions
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]; |