From d654e80084011ea85958de67a942c9552032bbee Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 02 Jun 2011 08:24:22 -0400
Subject: [PATCH] - Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943)
---
CHANGELOG | 1 +
program/include/main.inc | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6032314..b17e658 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix identities "reply-to" and "bcc" fields have a bogus value when left empty (#1487943)
- Add popup with basic fields selection for addressbook search
- Case-insensitive matching in autocompletion (#1487933)
- Added option to force spellchecking before sending a message (#1485458)
diff --git a/program/include/main.inc b/program/include/main.inc
index c312df5..ab529d7 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1809,6 +1809,10 @@
$domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain);
+ if ($domain === false) {
+ return '';
+ }
+
return $at ? $user . '@' . $domain : $domain;
}
--
Gitblit v1.9.1