diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-03-18 19:51:32 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-03-18 19:51:32 +0100 |
| commit | d8270b66ccca4aef0db76bade89a398b1d33abe9 (patch) | |
| tree | 93bb29ea370f4046d8f20a9ace24c11629015c10 | |
| parent | 5147eea0a228e6680f0af7b6f9f2f4fe41aa921d (diff) | |
Fix wrapping of text lines with the same length as specified length limit
| -rw-r--r-- | program/lib/Roundcube/rcube_mime.php | 7 | ||||
| -rw-r--r-- | tests/src/format-flowed.txt | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 2f24a1bb3..d21e3b4d5 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -595,11 +595,12 @@ class rcube_mime while (count($list)) { $line = array_shift($list); $l = mb_strlen($line); - $newlen = $len + $l + ($len ? 1 : 0); + $space = $len ? 1 : 0; + $newlen = $len + $l + $space; if ($newlen <= $width) { - $string .= ($len ? ' ' : '').$line; - $len += (1 + $l); + $string .= ($space ? ' ' : '').$line; + $len += ($space + $l); } else { if ($l > $width) { diff --git a/tests/src/format-flowed.txt b/tests/src/format-flowed.txt index a390ffd11..359a41aec 100644 --- a/tests/src/format-flowed.txt +++ b/tests/src/format-flowed.txt @@ -1,7 +1,7 @@ I'm replying on this with a very long line which is then wrapped and
space-stuffed because the draft is saved as format=flowed.
- From what's specified in RFC 2646 some lines need to be space-stuffed to
-avoid muning during transport.
+ From what's specified in RFC 2646 some lines need to be space-stuffed to avoid
+muning during transport.
X
|