diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-14 10:32:36 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-14 10:32:36 +0000 |
| commit | 130d6ee4e12ace07acb000aa9aad43f4597c0013 (patch) | |
| tree | 1e65265a8377acc6602188d65176d5a793a2ea58 /roundcubemail/program | |
| parent | ebf998a7a2d33a8d539987295e3ddd88754970f0 (diff) | |
- small fix for format=flowed parsing
git-svn-id: https://svn.roundcube.net/trunk@3964 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_message.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index a15117e19..40df8191b 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -612,7 +612,8 @@ class rcube_message $q = strlen(str_replace(' ', '', $regs[0])); $line = substr($line, strlen($regs[0])); - if ($q == $q_level && isset($text[$last]) + if ($q == $q_level && $line + && isset($text[$last]) && $text[$last][strlen($text[$last])-1] == ' ' ) { $text[$last] .= $line; @@ -631,7 +632,7 @@ class rcube_message // remove space-stuffing $line = preg_replace('/^\s/', '', $line); - if (isset($text[$last]) + if (isset($text[$last]) && $line && $text[$last] != '-- ' && $text[$last][strlen($text[$last])-1] == ' ' ) { |