From 68fb9e63f06d43e4c07d4a57fd153de2ce8474b0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 21 Jan 2013 06:02:44 -0500
Subject: [PATCH] Rtrim() quoted lines on conversion to flowed format (according to RFC2646)
---
program/lib/Roundcube/rcube_mime.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index e9d5cf1..2f24a1b 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -544,8 +544,8 @@
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);
}
--
Gitblit v1.9.1