makeing ADOdb the configuration default: unless you explicitly set

$GLOBALS['phpgw_info']['server']['use_adodb'] = False;
in your header.inc.php, eGW uses ADOdb
This commit is contained in:
Ralf Becker 2004-03-15 22:41:55 +00:00
parent 3df33d3ef6
commit 2238ea9dbb

View File

@ -13,7 +13,7 @@
/* /*
* Database abstraction library * Database abstraction library
* *
* This allows eGroupWare to use multiple database backends via ADOdb * This allows eGroupWare to use multiple database backends via ADOdb 4.20
* *
* @package phpgwapi * @package phpgwapi
* @subpackage db * @subpackage db
@ -25,7 +25,7 @@
{ {
$GLOBALS['phpgw_info']['server']['db_type'] = 'mysql'; $GLOBALS['phpgw_info']['server']['db_type'] = 'mysql';
} }
if (@$GLOBALS['phpgw_info']['server']['use_adodb']) if (!isset($GLOBALS['phpgw_info']['server']['use_adodb']) || $GLOBALS['phpgw_info']['server']['use_adodb'])
{ {
include_once('adodb/adodb.inc.php'); include_once('adodb/adodb.inc.php');
} }
@ -864,7 +864,7 @@
} }
// REMOVE-IF-ONLY-ADODB // REMOVE-IF-ONLY-ADODB
if (!@$GLOBALS['phpgw_info']['server']['use_adodb']) if (isset($GLOBALS['phpgw_info']['server']['use_adodb']) && !$GLOBALS['phpgw_info']['server']['use_adodb'])
{ {
include(PHPGW_API_INC.'/class.db_'.$GLOBALS['phpgw_info']['server']['db_type'].'.inc.php'); include(PHPGW_API_INC.'/class.db_'.$GLOBALS['phpgw_info']['server']['db_type'].'.inc.php');
} }