From 2a6472b2c232f1eea09d0f337ecfc7c17f1ae86d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 26 Jan 2013 17:13:52 +0100
Subject: Bring back lost text braking width adjustment when quoting blockquote
parts
---
program/lib/Roundcube/rcube_html2text.php | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 3d32fe766..9b248a3a8 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -597,9 +597,16 @@ class rcube_html2text
// get blockquote content
$body = trim(substr($text, $startpos, $end - $startpos));
+ // adjust text wrapping width
+ $p_width = $this->width;
+ if ($this->width > 0) $this->width -= 2;
+
// replace content with inner blockquotes
$this->_converter($body);
+ // resore text width
+ $this->width = $p_width;
+
// Add citation markers and create <pre> block
$body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_ballback'), trim($body));
$body = '<pre>' . htmlspecialchars($body) . '</pre>';
--
cgit v1.2.3