From 848e204ef9bdaf989e7e48025d4ea6ee21e7678e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 13 Sep 2014 06:36:54 -0400
Subject: [PATCH] Fix validation of email addresses with IDNA domains (#1490067)
---
program/steps/utils/html2text.inc | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc
index c6481b1..f6e2bec 100644
--- a/program/steps/utils/html2text.inc
+++ b/program/steps/utils/html2text.inc
@@ -19,10 +19,15 @@
+-----------------------------------------------------------------------+
*/
-$html = $HTTP_RAW_POST_DATA;
+$html = stream_get_contents(fopen('php://input', 'r'));
+
+// strip slashes if magic_quotes enabled
+if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) {
+ $html = stripslashes($html);
+}
// Replace emoticon images with its text representation
-$html = rcmail_replace_emoticons($html);
+$html = $RCMAIL->replace_emoticons($html);
$converter = new rcube_html2text($html, false, true, 0);
--
Gitblit v1.9.1