From 08c39127d3f603501fe628fcadd403a92fb4c8dc Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 11 Nov 2012 12:27:25 +0100 Subject: Fix bug where leading blanks were stripped from quoted lines (#1488795) Conflicts: CHANGELOG --- CHANGELOG | 2 ++ program/steps/mail/func.inc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a503aa8b6..d57f57b4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- Fix bug where leading blanks were stripped from quoted lines (#1488795) + RELEASE 0.8.3 ------------- - Fix AREA links handling (#1488792) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 2c6db01eb..efca65b74 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -789,8 +789,8 @@ function rcmail_plain_body($body, $flowed=false) // find/mark quoted lines... for ($n=0, $cnt=count($body); $n < $cnt; $n++) { - if ($body[$n][0] == '>' && preg_match('/^(>+\s*)+/', $body[$n], $regs)) { - $q = strlen(preg_replace('/\s/', '', $regs[0])); + if ($body[$n][0] == '>' && preg_match('/^(>+ {0,1})+/', $body[$n], $regs)) { + $q = substr_count($regs[0], '>'); $body[$n] = substr($body[$n], strlen($regs[0])); if ($q > $quote_level) { -- cgit v1.2.3