From 9cc5a522df25d7f98e578dc483e0ff067b6c1ded Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 30 Aug 2014 06:33:42 -0400
Subject: [PATCH] Fix so rcube_text2html class does not depend on rcmail_string_replacer
---
program/steps/mail/func.inc | 2 +-
program/lib/Roundcube/rcube_text2html.php | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php
index 46c2b7e..0afc6d1 100644
--- a/program/lib/Roundcube/rcube_text2html.php
+++ b/program/lib/Roundcube/rcube_text2html.php
@@ -57,6 +57,8 @@
'end' => '</div>',
// enables links replacement
'links' => true,
+ // string replacer class
+ 'replacer' => 'rcube_string_replacer',
);
@@ -141,7 +143,7 @@
{
// make links and email-addresses clickable
$attribs = array('link_attribs' => array('rel' => 'noreferrer', 'target' => '_blank'));
- $replacer = new rcmail_string_replacer($attribs);
+ $replacer = new $this->config['replacer']($attribs);
if ($this->config['flowed']) {
$flowed_char = 0x01;
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 41fe28e..a7c483b 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -920,7 +920,7 @@
*/
function rcmail_plain_body($body, $flowed = false)
{
- $options = array('flowed' => $flowed, 'wrap' => !$flowed);
+ $options = array('flowed' => $flowed, 'wrap' => !$flowed, 'replacer' => 'rcmail_string_replacer');
$text2html = new rcube_text2html($body, false, $options);
$body = $text2html->get_html();
--
Gitblit v1.9.1