From b0eeaac9e01b602b76e4e199a061351888a13cbe Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 5 Aug 2010 07:14:08 +0000
Subject: - Fix: rcube_user::get_username() doesn't take mail_domain setting
 into account (#1486895)

---
 program/include/rcube_user.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'program/include')

diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 22ec38d2e..557d31480 100644
--- 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;
-- 
cgit v1.2.3