summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-01-17 12:21:08 +0000
committeralecpl <alec@alec.pl>2011-01-17 12:21:08 +0000
commita76cbddfc92adbf4e8cb18dda5f668ec4de8a114 (patch)
tree846662bbafbf29010d488b8112547330160df255 /program/include/rcmail.php
parent68d2d541002017dae51127aa05af58d19916655b (diff)
- Fix %h/%z variables in username_domain option (#1487701)
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 7c8d4fc33..cdf959f2e 100644
--- a/program/include/rcmail.php
+++ b/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