From 187833dff94146a9b176a1ca4a5c9996809fd4a7 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 2 Jun 2011 12:36:32 +0000 Subject: - Apply fixes from trunk --- program/include/main.inc | 4 ++++ program/lib/washtml.php | 2 +- program/steps/mail/func.inc | 2 +- program/steps/settings/save_identity.inc | 11 +++++++---- 4 files changed, 13 insertions(+), 6 deletions(-) (limited to 'program') diff --git a/program/include/main.inc b/program/include/main.inc index 72a190595..3c04e20bf 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1916,6 +1916,10 @@ function rcube_idn_convert($input, $is_utf=false) $domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain); + if ($domain === false) { + return ''; + } + return $at ? $user . '@' . $domain : $domain; } diff --git a/program/lib/washtml.php b/program/lib/washtml.php index e8befe835..a5eeb841b 100644 --- a/program/lib/washtml.php +++ b/program/lib/washtml.php @@ -274,7 +274,7 @@ class washtml // Remove invalid HTML comments (#1487759) // Don't remove valid conditional comments - $html = preg_replace('/