From 42b8a60cf33eb3eb768b11b9c94f79b152f75ca5 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 19 Nov 2012 11:18:15 +0100 Subject: Fix wrapping of quoted text with format=flowed (#1488177) --- program/include/rcube_mime.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'program') diff --git a/program/include/rcube_mime.php b/program/include/rcube_mime.php index ac3ef9e8a..48175b46a 100644 --- a/program/include/rcube_mime.php +++ b/program/include/rcube_mime.php @@ -539,11 +539,11 @@ class rcube_mime foreach ($text as $idx => $line) { if ($line != '-- ') { - if ($line[0] == '>' && preg_match('/^(>+)/', $line, $regs)) { - $prefix = $regs[0]; - $level = strlen($prefix); - $line = rtrim(substr($line, $level)); - $line = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix ", false, $charset); + if ($line[0] == '>' && preg_match('/^(>+ {0,1})+/', $line, $regs)) { + $level = substr_count($regs[0], '>'); + $prefix = str_repeat('>', $level) . ' '; + $line = rtrim(substr($line, strlen($regs[0]))); + $line = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset); } else if ($line) { $line = self::wordwrap(rtrim($line), $length - 2, " \r\n", false, $charset); -- cgit v1.2.3