summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-01-26 17:13:52 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-01-28 20:54:03 +0100
commit737b629c6f947b956cacf188c2f6d6a410c36f3a (patch)
tree64867e101d06b9f182a0997ff0bddfaa205a6c70 /program/lib
parent72e24b7a632b7f713082d9100176064814cf2f61 (diff)
Bring back lost text braking width adjustment when quoting blockquote parts
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_html2text.php7
1 files changed, 7 insertions, 0 deletions
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>';