From 187833dff94146a9b176a1ca4a5c9996809fd4a7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 2 Jun 2011 12:36:32 +0000
Subject: - Apply fixes from trunk

---
 program/include/main.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'program/include')

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;
 }
 
-- 
cgit v1.2.3