[Mantisbt-cvs] mantisbt/core database_api.php,1.38,1.39

[Paul R. <pri...@us...>]

Update of /cvsroot/mantisbt/mantisbt/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8536/core

Modified Files:
	database_api.php 
Log Message:
Only set up ADODb if we're opening a database connection.

Index: database_api.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/core/database_api.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- database_api.php	9 Dec 2004 18:55:06 -0000	1.38
+++ database_api.php	29 Jan 2005 18:31:45 -0000	1.39
@@ -18,8 +18,6 @@
 
 	require_once( $t_core_dir . 'adodb/adodb.inc.php' );
 
-	$g_db = $db = ADONewConnection($g_db_type);
-
 	# An array in which all executed queries are stored.  This is used for profiling
 	$g_queries_array = array();
 
@@ -84,12 +82,12 @@
 	}
 
 	# --------------------
-	# timer analysis 
+	# timer analysis
 	function microtime_float() {
 		list( $usec, $sec ) = explode( " ", microtime() );
 		return ( (float)$usec + (float)$sec );
 	}
-	
+
 	# --------------------
 	# execute query, requires connection to be opened
 	# If $p_error_on_failure is true (default) an error will be triggered
@@ -106,7 +104,7 @@
 		$t_elapsed = number_format( microtime_float() - $t_start, 4);
 		array_push ( $g_queries_array, array( $p_query, $t_elapsed ) );
 
-		if ( !$t_result ) {
+		if ( FALSE === $t_result ) {
 			db_error($p_query);
 			trigger_error( ERROR_DB_QUERY_FAILED, ERROR );
 			return false;
@@ -379,9 +377,11 @@
 		return $t_total;
 	}
 
-		
+
 	# --------------------
 	if ( !isset( $g_skip_open_db ) ) {
+		$g_db = $db = ADONewConnection($g_db_type);
+
 		if ( OFF == $g_use_persistent_connections ) {
 			db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
 		} else {