Permalink
Browse files

html2text moved to framework

  • Loading branch information...
1 parent 72dee47 commit e98d65194874d843c7593f7bd488a436038b8310 @JohnDoh committed Dec 27, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 include/rcube_sieve_script.php
  2. +2 −2 sieverules.php
@@ -438,7 +438,7 @@ public function as_text()
$MAIL_MIME->setHTMLBody($action['msg']);
// add a plain text version of the e-mail as an alternative part.
- $h2t = new html2text($action['msg'], false, true, 0);
+ $h2t = new rcube_html2text($action['msg'], false, true, 0);
$plainTextPart = $h2t->get_text();
if (!$plainTextPart) {
// empty message body breaks attachment handling in drafts
View
@@ -645,7 +645,7 @@ function gen_form($attrib)
$a_signatures[$identity_id]['text'] = $sql_arr['signature'];
if ($sql_arr['html_signature'] == 1) {
- $h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
+ $h2t = new rcube_html2text($a_signatures[$identity_id]['text'], false, false);
$a_signatures[$identity_id]['text'] = trim($h2t->get_text());
}
}
@@ -1910,7 +1910,7 @@ private function _action_row($ext, $actions_table, $rowid, $action, $attrib, $ex
$charset = $action['charset'];
if ($htmlmsg == '1' && $rcmail->config->get('htmleditor') == '0') {
- $h2t = new html2text($msg, false, true, 0);
+ $h2t = new rcube_html2text($msg, false, true, 0);
$msg = $h2t->get_text();
$htmlmsg = '';
}

0 comments on commit e98d651

Please sign in to comment.