summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-06-02 12:36:32 +0000
committeralecpl <alec@alec.pl>2011-06-02 12:36:32 +0000
commit187833dff94146a9b176a1ca4a5c9996809fd4a7 (patch)
tree8018d76e44be79286d116d0588b7bec0298f5432 /program/include
parentfcbf7a12fff1a3cd8bbace46d9b61e4ce5b6a7ce (diff)
- Apply fixes from trunk
Diffstat (limited to 'program/include')
-rw-r--r--program/include/main.inc4
1 files changed, 4 insertions, 0 deletions
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;
}