fix for 006722: Remaining mysqli_ install problems (ref. #0006672): m…

…ysqli_real_escape_string() expects parameter 1 to be link

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/branches/BRANCH_1_0_0@3989 f5dc347c-c33d-0410-90a0-b07cc1902cb9

admin/install.php

@@ -6,7 +6,7 @@
 	# See the README and LICENSE files for details
 
 	# --------------------------------------------------------
-	# $Id: install.php,v 1.22.10.1 2006-02-08 03:04:05 thraxisp Exp $
+	# $Id: install.php,v 1.22.10.2 2006-02-18 04:18:59 thraxisp Exp $
 	# --------------------------------------------------------
 ?>
 <?php
@@ -491,6 +491,7 @@ function InsertData( $p_table, $p_data ) {
 	# install the tables
 	if ( false == $g_failed ) {
 		$g_db_connected = false; # fake out database access routines used by config_get
+		$GLOBALS['g_db_type'] = $f_db_type; # database_api references this
 		require_once( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'schema.php' );
 		$g_db = ADONewConnection( $f_db_type );
 		$t_result = @$g_db->Connect( $f_hostname, $f_admin_username, $f_admin_password, $f_database_name );

core/adodb/adodb.inc.php

@@ -3722,6 +3722,15 @@ function _adodb_getdriver($provider,$drivername,$perf=false)
 		}
 
 		switch($drivername) {
+		case 'mysqlt':
+		case 'mysqli': 
+				$drivername='mysql'; 
+				break;
+		case 'postgres7':
+		case 'postgres8':
+				$drivername = 'postgres'; 
+				break;	
+		case 'firebird15': $drivername = 'firebird'; break;
 		case 'oracle': $drivername = 'oci8'; break;
 		case 'access': if ($perf) $drivername = ''; break;
 		case 'db2'   : break;