From 2f8b1036da42ec3d15a51c6b17a473f9f4df71d3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Sat, 07 Feb 2015 12:33:24 -0500
Subject: [PATCH] Bump version and copyright year
---
program/lib/Roundcube/rcube_text2html.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php
index 363f1b2..1981b2f 100644
--- a/program/lib/Roundcube/rcube_text2html.php
+++ b/program/lib/Roundcube/rcube_text2html.php
@@ -1,6 +1,6 @@
<?php
-/**
+/*
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2008-2014, The Roundcube Dev Team |
@@ -57,6 +57,8 @@
'end' => '</div>',
// enables links replacement
'links' => true,
+ // string replacer class
+ 'replacer' => 'rcube_string_replacer',
);
@@ -127,10 +129,8 @@
*/
protected function _convert()
{
- $text = stripslashes($this->text);
-
// Convert TXT to HTML
- $this->html = $this->_converter($text);
+ $this->html = $this->_converter($this->text);
$this->_converted = true;
}
@@ -143,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;
--
Gitblit v1.9.1