[integration:xoops] correction for MySQLi Connection (mysqli API)

nao-pon · Sep 7, 2013 · b1d9513 · b1d9513
1 parent bc5a453
commit b1d9513
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/xoops_trust_path/modules/xpwiki/include/x20_keepblockoptions.inc.php b/xoops_trust_path/modules/xpwiki/include/x20_keepblockoptions.inc.php
@@ -62,7 +62,7 @@
 	}
 
 	for ($i = 1 ; $i <= $count ; $i++) {
-		$sql = "SELECT name,options FROM ".$db->prefix('newblocks')." WHERE mid=".$mid." AND func_num=".$i." AND show_func='".mysql_real_escape_string($modversion['blocks'][$i]['show_func'])."' AND func_file='".mysql_real_escape_string($modversion['blocks'][$i]['file'])."'";
+		$sql = "SELECT name,options FROM ".$db->prefix('newblocks')." WHERE mid=".$mid." AND func_num=".$i." AND show_func=".$db->quoteString($modversion['blocks'][$i]['show_func'])." AND func_file='".mysql_real_escape_string($modversion['blocks'][$i]['file'])."'";
 		$fresult = $db->query($sql);
 		$fblock = $db->fetchArray($fresult);
 		if ( isset( $fblock['options'] ) ) {

diff --git a/xoops_trust_path/modules/xpwiki/oninstall.php b/xoops_trust_path/modules/xpwiki/oninstall.php
@@ -41,7 +41,11 @@ function xpwiki_oninstall_base( $module , $mydirname )
 		$sql_query = trim( file_get_contents( $sql_file_path ) ) ;
 
 		// [ MySQL Version >= 5 ] BLOB and TEXT columns cannot be assigned a default value.
-		$mysql_ver = mysql_get_server_info();
+		if (is_object($db->conn) && get_class($db->conn) === 'mysqli') {
+			$mysql_ver = mysqli_get_server_info($db->conn);
+		} else {
+			$mysql_ver = mysql_get_server_info();
+		}
 		if (@ $mysql_ver{0} >= 5) {
 			$sql_query = str_replace(' default \'\'', '', $sql_query);
 		}