summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-01-21 12:00:24 +0100
committerAleksander Machniak <alec@alec.pl>2013-01-21 12:00:24 +0100
commit87a96809c7a067f8cc140884558898fd92c87032 (patch)
tree4f972419992f3f1b355c54362064a1f9b15609d7 /program
parent7ebed11b05fe9b3659d18ed797572e7ffccad5a3 (diff)
Rtrim() quoted lines on conversion to flowed format (according to RFC2646)
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_mime.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index e9d5cf148..2f24a1bb3 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -544,8 +544,8 @@ class rcube_mime
if ($line[0] == '>') {
// remove quote chars, store level in $level
$line = preg_replace('/^>+/', '', $line, -1, $level);
- // remove (optional) space-staffing
- $line = preg_replace('/^ /', '', $line);
+ // remove (optional) space-staffing and spaces before the line end
+ $line = preg_replace('/(^ | +$)/', '', $line);
$prefix = str_repeat('>', $level) . ' ';
$line = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset);
}