From efd3a25c8406485b9e5e893eade780ef39786ff4 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 2 Jun 2011 12:24:22 +0000
Subject: - Fix identities "reply-to" and "bcc" fields have a bogus value when
 left empty (#1487943)

git-svn-id: https://svn.roundcube.net/trunk@4828 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index c312df547..ab529d74b 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -1809,6 +1809,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