mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-26 01:43:47 +01:00
Fix extra domain being added by empty config_user variable
This commit is contained in:
parent
ab1a464ab9
commit
372f742c69
@ -147,7 +147,7 @@
|
||||
/* Setup defaults to aid in header upgrade to version 1.26.
|
||||
* This was the first version to include the following values.
|
||||
*/
|
||||
if(!@isset($GLOBALS['phpgw_domain'][$FormDomain]['config_user']))
|
||||
if(!@isset($GLOBALS['phpgw_domain'][$FormDomain]['config_user']) && isset($GLOBALS['phpgw_domain'][$FormDomain]))
|
||||
{
|
||||
@$GLOBALS['phpgw_domain'][$FormDomain]['config_user'] = 'admin';
|
||||
}
|
||||
|
@ -389,8 +389,6 @@
|
||||
$GLOBALS['phpgw_info']['server']['config_passwd'] = $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
|
||||
$GLOBALS['phpgw_info']['server']['config_user'] = $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_user'];
|
||||
|
||||
|
||||
|
||||
if(@$adddomain)
|
||||
{
|
||||
$GLOBALS['phpgw_domain'][lang('new')] = array();
|
||||
|
Loading…
Reference in New Issue
Block a user