Index: trunk/admin/install/inst_ado.php =================================================================== diff -u -r13 -r383 --- trunk/admin/install/inst_ado.php (.../inst_ado.php) (revision 13) +++ trunk/admin/install/inst_ado.php (.../inst_ado.php) (revision 383) @@ -1,25 +1,23 @@ 0) - { - $g_adodbConnection = ADONewConnection($g_DBType); - $connected = $g_adodbConnection->PConnect($g_DBHost,$g_DBUser,$g_DBUserPassword,$g_DBName); - if(!$connected) - { - //echo "Error connecting to database $g_DBHost
\n"; - // die(); - } - $ADODB_CACHE_DIR = $pathtoroot."cache"; - $ADODB_FETCH_MODE = 2; - $ADODB_COUNTRECS = FALSE; - $g_adodbConnection->debug = false; - $g_adodbConnection->cacheSecs = 3600; - } - return $g_adodbConnection; + if( !isset($DB) && strlen($g_DBType) > 0 ) + { + $DB = ADONewConnection($g_DBType); + $connected = $DB->PConnect($g_DBHost, $g_DBUser, $g_DBUserPassword, $g_DBName); + + $ADODB_CACHE_DIR = $pathtoroot.'cache'; + $ADODB_FETCH_MODE = 2; + $ADODB_COUNTRECS = false; + $DB->debug = false; + $DB->cacheSecs = 3600; + } + return $DB; } + ?>