Use config_app='phpgwapi' for filling 'server' array, to avoid conflicts

This commit is contained in:
Miles Lott 2001-05-21 17:30:55 +00:00
parent 131fb588ca
commit eb0aa37eaa

View File

@ -247,23 +247,24 @@
$phpgw->db->Halt_On_Error = 'yes'; $phpgw->db->Halt_On_Error = 'yes';
/* Fill phpgw_info["server"] array */ /* Fill phpgw_info["server"] array */
$phpgw->db->query("select * from phpgw_config",__LINE__,__FILE__); $phpgw->db->query("select * from phpgw_config WHERE config_app='phpgwapi'",__LINE__,__FILE__);
while ($phpgw->db->next_record()) { while ($phpgw->db->next_record())
$phpgw_info["server"][$phpgw->db->f("config_name")] = stripslashes($phpgw->db->f("config_value")); {
$phpgw_info['server'][$phpgw->db->f('config_name')] = stripslashes($phpgw->db->f('config_value'));
} }
/************************************************************************\ /************************************************************************\
* Required classes * * Required classes *
\************************************************************************/ \************************************************************************/
$phpgw->common = CreateObject("phpgwapi.common"); $phpgw->common = CreateObject('phpgwapi.common');
$phpgw->hooks = CreateObject("phpgwapi.hooks"); $phpgw->hooks = CreateObject('phpgwapi.hooks');
$phpgw->auth = createobject("phpgwapi.auth"); $phpgw->auth = CreateObject('phpgwapi.auth');
$phpgw->acl = CreateObject("phpgwapi.acl"); $phpgw->acl = CreateObject('phpgwapi.acl');
$phpgw->accounts = createobject("phpgwapi.accounts"); $phpgw->accounts = CreateObject('phpgwapi.accounts');
$phpgw->session = CreateObject("phpgwapi.sessions"); $phpgw->session = CreateObject('phpgwapi.sessions');
$phpgw->preferences = CreateObject("phpgwapi.preferences"); $phpgw->preferences = CreateObject('phpgwapi.preferences');
$phpgw->applications = CreateObject("phpgwapi.applications"); $phpgw->applications = CreateObject('phpgwapi.applications');
$phpgw->translation = CreateObject("phpgwapi.translation"); $phpgw->translation = CreateObject('phpgwapi.translation');
// $phpgw->datetime = CreateObject('phpgwapi.datetime'); // $phpgw->datetime = CreateObject('phpgwapi.datetime');
print_debug('main class loaded'); print_debug('main class loaded');