extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix extra domain being added by empty config_user variable

Browse Source
This commit is contained in:
Miles Lott 2004-01-20 00:52:11 +00:00
parent ab1a464ab9
commit 372f742c69
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.setup.inc.php
View File

@ -147,7 +147,7 @@
/* Setup defaults to aid in header upgrade to version 1.26. /* Setup defaults to aid in header upgrade to version 1.26.
* This was the first version to include the following values. * 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'; @$GLOBALS['phpgw_domain'][$FormDomain]['config_user'] = 'admin';
} }

2
setup/manageheader.php
View File

@ -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_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']; $GLOBALS['phpgw_info']['server']['config_user'] = $GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_user'];
if(@$adddomain) if(@$adddomain)
{ {
$GLOBALS['phpgw_domain'][lang('new')] = array(); $GLOBALS['phpgw_domain'][lang('new')] = array();