diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-11-11 12:27:25 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-11-11 12:27:25 +0100 |
| commit | e5e2190e4e7a831df432fe370b7dd0715029a0b9 (patch) | |
| tree | 06fc7fe9429f0901c8c496930cf207a4fba77eb8 | |
| parent | 5af9312889f9396d7b01f39aa6b0892d08375a00 (diff) | |
Fix bug where leading blanks were stripped from quoted lines (#1488795)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix bug where leading blanks were stripped from quoted lines (#1488795) - Upgraded to jQuery 1.8.2 and jQuery UI 1.9.1 - Add config option to automatically generate LDAP attributes for new entries - Better client-side timezone detection using the jsTimezoneDetect library (#1488725) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index f128a3834..a1dfa2853 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -801,8 +801,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) { |