diff options
| -rw-r--r-- | program/lib/Roundcube/rcube_text2html.php | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php index 5da771ac8..6032726b0 100644 --- a/program/lib/Roundcube/rcube_text2html.php +++ b/program/lib/Roundcube/rcube_text2html.php @@ -259,14 +259,20 @@ class rcube_text2html // replace spaces with non-breaking spaces if ($is_flowed) { - $text = preg_replace_callback('/(^|[^ ])( +)/', function($matches) { - if (!strlen($matches[2])) { - return str_repeat($nbsp, strlen($matches[2])); - } - else { - return $matches[1] . ' ' . str_repeat($nbsp, strlen($matches[2])-1); - } - }, $text); + $pos = 0; + $diff = 0; + $len = strlen($nbsp); + $copy = $text; + + while (($pos = strpos($text, ' ', $pos)) !== false) { + if ($pos == 0 || $text[$pos-1] == ' ') { + $copy = substr_replace($copy, $nbsp, $pos + $diff, 1); + $diff += $len - 1; + } + $pos++; + } + + $text = $copy; } else { $text = str_replace(' ', $nbsp, $text); |