From f91f8533678c388b879d9e999a6bcc9e22ad7e19 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <root@paranoid>
Date: Tue, 5 Aug 2014 16:44:07 +0200
Subject: lot of stuff

---
 program/lib/Roundcube/rcube_html2text.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'program/lib/Roundcube/rcube_html2text.php')

diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 01362e6fb..9b248a3a8 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -608,27 +608,24 @@ class rcube_html2text
                     $this->width = $p_width;
 
                     // Add citation markers and create <pre> block
-                    $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_callback'), trim($body));
+                    $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_ballback'), trim($body));
                     $body = '<pre>' . htmlspecialchars($body) . '</pre>';
 
-                    $text = substr_replace($text, $body . "\n", $start, $end + 13 - $start);
+                    $text = substr($text, 0, $start) . $body . "\n" . substr($text, $end + 13);
                     $offset = 0;
-
                     break;
                 }
-            }
-            while ($end || $next);
+            } while ($end || $next);
         }
     }
 
     /**
      * Callback function to correctly add citation markers for blockquote contents
      */
-    public function blockquote_citation_callback($m)
+    public function blockquote_citation_ballback($m)
     {
-        $line  = ltrim($m[2]);
+        $line = ltrim($m[2]);
         $space = $line[0] == '>' ? '' : ' ';
-
         return $m[1] . '>' . $space . $line;
     }
 
-- 
cgit v1.2.3