extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed problem in setup, because of not instanciated account object

Browse Source
This commit is contained in:
Ralf Becker 2007-12-13 23:46:44 +00:00
parent 1c2a564c14
commit 6651f0efc4
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/inc/class.setup_cmd.inc.php
View File

@ -95,6 +95,8 @@ abstract class setup_cmd extends admin_cmd
*/
static protected $egw_setup;
static private $egw_accounts_backup;
/**
* Create the setup enviroment (for running within setup or eGW)
*/
@ -114,6 +116,11 @@ abstract class setup_cmd extends admin_cmd
$header = $cmd->run();
$GLOBALS['egw_domain'] = $header['egw_domain'];
if (is_object($GLOBALS['egw']->accounts) && is_null(self::$egw_accounts_backup))
{
self::$egw_accounts_backup = $GLOBALS['egw']->accounts;
unset($GLOBALS['egw']->accounts);
}
if ($this->config) self::$egw_setup->setup_account_object($this->config);
}
if (is_object($GLOBALS['egw']->db) && $domain)
@ -147,6 +154,11 @@ abstract class setup_cmd extends admin_cmd
$GLOBALS['egw_info']['server']['db_pass'],
$GLOBALS['egw_info']['server']['db_type']
);
if (!is_null(self::$egw_accounts_backup))
{
$GLOBALS['egw']->accounts = self::$egw_accounts_backup;
unset(self::$egw_accounts_backup);
}
}
}