From 372f742c690745b6c2145090c4ad4f75c482656f Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Tue, 20 Jan 2004 00:52:11 +0000 Subject: [PATCH] Fix extra domain being added by empty config_user variable --- phpgwapi/inc/class.setup.inc.php | 2 +- setup/manageheader.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.setup.inc.php b/phpgwapi/inc/class.setup.inc.php index 353c3d9656..8b5c493d1d 100644 --- a/phpgwapi/inc/class.setup.inc.php +++ b/phpgwapi/inc/class.setup.inc.php @@ -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'; } diff --git a/setup/manageheader.php b/setup/manageheader.php index 21c13f7612..9e04f24c46 100644 --- a/setup/manageheader.php +++ b/setup/manageheader.php @@ -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();