- Fix: rcube_user::get_username() doesn't take mail_domain setting into account (#1486895)

14 years ago · b0eeaac9e0
parent e96515460b
commit b0eeaac9e0
1 changed files with 5 additions and 3 deletions
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@ -74,9 +74,11 @@ class rcube_user
            if ($part == 'local') {
                return $local;
            }
-            // if no domain was provided use the default if available
-            if (empty($domain))
-                $domain = $this->data['mail_host'];
+            // if no domain was provided...
+            if (empty($domain)) {
+                $rcmail = rcmail::get_instance();
+                $domain = $rcmail->config->mail_domain($this->data['mail_host']);
+            }

            if ($part == 'domain') {
                return $domain;