From 9fc69184209c056b21e72d266010b52107d70afa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 02 Aug 2015 13:35:39 -0400
Subject: [PATCH] Disable links list generation on html-to-text conversion of identities or composed message (#1490437)
---
CHANGELOG | 1 +
program/steps/utils/html2text.inc | 8 ++++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 8189efc..43dd5d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@
- Fix some javascript errors in rare situations (#1490441)
- Fix error when using back button after sending an email (#1490009)
- Fix removing signature when switching to identity with an empty sig in HTML mode (#1490470)
+- Disable links list generation on html-to-text conversion of identities or composed message (#1490437)
RELEASE 1.1.2
-------------
diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc
index 90626e4..7fa8340 100644
--- a/program/steps/utils/html2text.inc
+++ b/program/steps/utils/html2text.inc
@@ -5,7 +5,7 @@
| program/steps/utils/html2text.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2012, The Roundcube Dev Team |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -29,7 +29,11 @@
// Replace emoticon images with its text representation
$html = $RCMAIL->replace_emoticons($html);
-$converter = new rcube_html2text($html, false, true, 0);
+$do_links = (bool) rcube_utils::get_input_value('_do_links', rcube_utils::INPUT_GET);
+$width = (int) rcube_utils::get_input_value('_width', rcube_utils::INPUT_GET);
+
+// Convert to text
+$converter = new rcube_html2text($html, false, $do_links, $width);
header('Content-Type: text/plain; charset=UTF-8');
print rtrim($converter->get_text());
--
Gitblit v1.9.1