From ead084693499934c467ca6a9c396367ac661dd61 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 15 Apr 2016 06:28:05 -0400
Subject: [PATCH] Plugin API: Add html2text hook (backport from master)
---
program/steps/mail/compose.inc | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index f158029..7c89c9b 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -643,8 +643,8 @@
$text = $html = $sql_arr['signature'];
if ($sql_arr['html_signature']) {
- $h2t = new rcube_html2text($html, false, true);
- $text = trim($h2t->get_text());
+ $text = $RCMAIL->html2text($html, array('links' => false));
+ $text = trim($text);
}
else {
$t2h = new rcube_text2html($text, false);
@@ -858,9 +858,8 @@
if ($part->ctype_secondary == 'html') {
// use html part if it has been used for message (pre)viewing
// decrease line length for quoting
- $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
- $txt = new rcube_html2text($body, false, true, $len);
- $body = $txt->get_text();
+ $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
+ $body = $RCMAIL->html2text($body, array('width' => $len));
}
else {
if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
@@ -1043,7 +1042,7 @@
$suffix = '</blockquote>';
}
else {
- $suffix = '</blockquote><p></p>';
+ $suffix = '</blockquote><p><br/></p>';
}
}
--
Gitblit v1.9.1