From c40f06de24b4df2b9ccca385fa07a133a6ee821e Mon Sep 17 00:00:00 2001 From: skeeter Date: Wed, 21 Mar 2001 05:01:28 +0000 Subject: [PATCH] Juggling the location of get_account_id(). --- phpgwapi/inc/functions.inc.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php index a20648e2ec..cc051bbe4f 100644 --- a/phpgwapi/inc/functions.inc.php +++ b/phpgwapi/inc/functions.inc.php @@ -206,6 +206,20 @@ $phpgw_info["server"][$phpgw->db->f("config_name")] = stripslashes($phpgw->db->f("config_value")); } + /************************************************************************\ + * Required classes * + \************************************************************************/ + $phpgw->common = CreateObject("phpgwapi.common"); + $phpgw->hooks = CreateObject("phpgwapi.hooks"); + $phpgw->auth = createobject("phpgwapi.auth"); + $phpgw->acl = CreateObject("phpgwapi.acl"); + $phpgw->accounts = createobject("phpgwapi.accounts"); + $phpgw->session = CreateObject("phpgwapi.sessions"); + $phpgw->preferences = CreateObject("phpgwapi.preferences"); + $phpgw->applications = CreateObject("phpgwapi.applications"); + $phpgw->translation = CreateObject("phpgwapi.translation"); + print_debug('main class loaded'); + /************************************************************************\ * This function will return a properly formatted account_id. * * This needs to be placed here, or some classes will have a problem * @@ -244,20 +258,6 @@ } } - /************************************************************************\ - * Required classes * - \************************************************************************/ - $phpgw->common = CreateObject("phpgwapi.common"); - $phpgw->hooks = CreateObject("phpgwapi.hooks"); - $phpgw->auth = createobject("phpgwapi.auth"); - $phpgw->acl = CreateObject("phpgwapi.acl"); - $phpgw->accounts = createobject("phpgwapi.accounts"); - $phpgw->session = CreateObject("phpgwapi.sessions"); - $phpgw->preferences = CreateObject("phpgwapi.preferences"); - $phpgw->applications = CreateObject("phpgwapi.applications"); - $phpgw->translation = CreateObject("phpgwapi.translation"); - print_debug('main class loaded'); - /****************************************************************************\ * This is a global constant that should be used * * instead of / or \ in file paths *