From c84af65117f53ea9c49c455132221467f013fc80 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 5 Aug 2010 07:14:08 +0000
Subject: - Fix: rcube_user::get_username() doesn't take mail_domain setting
 into account (#1486895)

git-svn-id: https://svn.roundcube.net/trunk@3870 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_user.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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