fixed a fatal error in (direct) updating a 1.0.x install

This commit is contained in:
Ralf Becker 2006-07-01 20:18:44 +00:00
parent 60c5bd673a
commit 27da7f6edb

View File

@ -87,11 +87,11 @@
{
// removing the ACL entries of deleted accounts
$GLOBALS['egw_setup']->setup_account_object();
if ($GLOBALS['phpgw']->accounts->table)
if ($GLOBALS['egw']->accounts->table)
{
$GLOBALS['phpgw']->accounts->table = $GLOBALS['egw_setup']->accounts_table;
$GLOBALS['egw']->accounts->table = $GLOBALS['egw_setup']->accounts_table;
}
if (($all_accounts = $GLOBALS['phpgw']->accounts->search(array('type'=>'both'))))
if (($all_accounts = $GLOBALS['egw']->accounts->search(array('type'=>'both'))))
{
foreach($all_accounts as $key => $value)
{
@ -588,9 +588,9 @@
{
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_accounts','egw_accounts');
$GLOBALS['egw_setup']->set_table_names(True);
if ($GLOBALS['phpgw']->accounts->table)
if ($GLOBALS['egw']->accounts->table)
{
$GLOBALS['phpgw']->accounts->table = $GLOBALS['egw_setup']->accounts_table;
$GLOBALS['egw']->accounts->table = $GLOBALS['egw_setup']->accounts_table;
}
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_acl','egw_acl');
$GLOBALS['egw_setup']->set_table_names(True);