summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-08-05 07:14:08 +0000
committeralecpl <alec@alec.pl>2010-08-05 07:14:08 +0000
commitb0eeaac9e01b602b76e4e199a061351888a13cbe (patch)
treea3496fb62b0305fd7a5d973a9666929ccc0755e3 /program/include
parente96515460b9cf2dc666de8cb5b10e90511e26991 (diff)
- Fix: rcube_user::get_username() doesn't take mail_domain setting into account (#1486895)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_user.php8
1 files changed, 5 insertions, 3 deletions
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;