summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-11 14:10:56 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-11 14:10:56 +0100
commite43dcb0df3e7ea6c05a8c1473b0da7834d5e39d9 (patch)
tree8aee0551cff7030213e94502f7b1e2a1152bad7c /program
parent03149131f754dd122f8707fbfc9e7ff47e9d6524 (diff)
parent71649445a0b81ee13f2326f0e35316f5fdbc91e6 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/func.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index c0d36daf4..e4c4d8121 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) {