Merge 99b8078373 into 98881a0cbd

4 years ago · 7875c01749
parent 98881a0cbd 99b8078373
commit 7875c01749
1 changed files with 2 additions and 0 deletions
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@ -226,6 +226,8 @@ class rcmail extends rcube
        }
        else if ($id && $ldap_config[$id]) {
            $domain   = $this->config->mail_domain($_SESSION['storage_host']);
+            $username_domain = $this->config->get('username_domain');
+            $domain   = is_array($username_domain) ? $username_domain[$domain] : $domain;
            $contacts = new rcube_ldap($ldap_config[$id], $this->config->get('ldap_debug'), $domain);
        }
        else if ($id === '0') {