From 25c8fe4eeb1e9c1a3055bb27984f1274f99fc1d7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 17 Jun 2015 08:03:13 -0400
Subject: [PATCH] Fix handling of non-break spaces in html to text conversion (#1490436)
---
CHANGELOG | 1 +
tests/Framework/Html2text.php | 5 +++++
program/lib/Roundcube/rcube_html2text.php | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c6db100..2c88e21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@
- Fix race-condition in saving user preferences and loading plugin config (#1490431)
- Fix so plain text signature field uses monospace font (#1490435)
- Fix so links with href == content aren't added to links list on html to text conversion (#1490434)
+- Fix handling of non-break spaces in html to text conversion (#1490436)
RELEASE 1.1.2
-------------
diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 5e12524..a2f6288 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -216,7 +216,7 @@
* @see $ent_search
*/
protected $ent_replace = array(
- ' ', // Non-breaking space
+ "\xC2\xA0", // Non-breaking space
'"', // Double quotes
"'", // Single quotes
'>',
diff --git a/tests/Framework/Html2text.php b/tests/Framework/Html2text.php
index 2f24594..be14882 100644
--- a/tests/Framework/Html2text.php
+++ b/tests/Framework/Html2text.php
@@ -51,6 +51,11 @@
'in' => 'test<br> test',
'out' => "test\ntest",
),
+ 8 => array(
+ 'title' => ' handling test',
+ 'in' => '<div>eye: test<br /> tes: test</div>',
+ 'out' => "eye: test\ntes: test",
+ ),
);
}
--
Gitblit v1.9.1