From d9d276ea700186a11c6525fec375160a76229b76 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 12 May 2014 04:20:42 -0400
Subject: [PATCH] Improve _convert_line() performance
---
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 5da771a..6032726 100644
--- a/program/lib/Roundcube/rcube_text2html.php
+++ b/program/lib/Roundcube/rcube_text2html.php
@@ -259,14 +259,20 @@
// 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);
--
Gitblit v1.9.1