From 130d6ee4e12ace07acb000aa9aad43f4597c0013 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 14 Sep 2010 10:32:36 +0000 Subject: - small fix for format=flowed parsing git-svn-id: https://svn.roundcube.net/trunk@3964 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_message.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/include/rcube_message.php') 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] == ' ' ) { -- cgit v1.2.3