From a76cbddfc92adbf4e8cb18dda5f668ec4de8a114 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 17 Jan 2011 07:21:08 -0500
Subject: [PATCH] - Fix %h/%z variables in username_domain option (#1487701)
---
program/include/rcmail.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 7c8d4fc..cdf959f 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -674,9 +674,9 @@
// Check if we need to add domain
if (!empty($config['username_domain']) && strpos($username, '@') === false) {
if (is_array($config['username_domain']) && isset($config['username_domain'][$host]))
- $username .= '@'.rcube_parse_host($config['username_domain'][$host]);
+ $username .= '@'.rcube_parse_host($config['username_domain'][$host], $host);
else if (is_string($config['username_domain']))
- $username .= '@'.rcube_parse_host($config['username_domain']);
+ $username .= '@'.rcube_parse_host($config['username_domain'], $host);
}
// Convert username to lowercase. If IMAP backend
--
Gitblit v1.9.1