diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-06-02 12:24:22 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-06-02 12:24:22 +0000 |
| commit | efd3a25c8406485b9e5e893eade780ef39786ff4 (patch) | |
| tree | 3422fccb78a828a3f2dea28a87cccdb8901d594c | |
| parent | 3fcd164612aa826a7c5e80916add86aac30d70bf (diff) | |
- 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
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/main.inc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 6032314b2..b17e658b4 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/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; } |