diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-01-17 12:21:08 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-01-17 12:21:08 +0000 |
| commit | f63d7675d829fedbaa12691f6ac498c525fd24b4 (patch) | |
| tree | d072dab8e7f204d9c0e93315efb4fc47e4b10ec2 /roundcubemail/program/include/rcmail.php | |
| parent | 99f1c0ac10b020078f1ea512fefae8042a63c339 (diff) | |
- Fix %h/%z variables in username_domain option (#1487701)
git-svn-id: https://svn.roundcube.net/trunk@4420 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcmail.php')
| -rw-r--r-- | roundcubemail/program/include/rcmail.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index 7c8d4fc33..cdf959f2e 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -674,9 +674,9 @@ class rcmail // Check if we need to add domain if (!empty($config['username_domain']) && strpos($username, '@') === false) { if (is_array($config['username_domain']) && isset($config['username_domain'][$host])) - $username .= '@'.rcube_parse_host($config['username_domain'][$host]); + $username .= '@'.rcube_parse_host($config['username_domain'][$host], $host); else if (is_string($config['username_domain'])) - $username .= '@'.rcube_parse_host($config['username_domain']); + $username .= '@'.rcube_parse_host($config['username_domain'], $host); } // Convert username to lowercase. If IMAP backend |