From: garvinhicking <garvinhicking>
Date: Mon, 1 May 2006 12:01:23 +0000 (+0000)
Subject: Fix some missing 'dbConn' variables, many thanks to Josef Moravek
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5d8fa98be1e034b4aea5d0d014b922f613eddf7c;p=s9y.git

Fix some missing 'dbConn' variables, many thanks to Josef Moravek
---

diff --git a/include/db/mysqli.inc.php b/include/db/mysqli.inc.php
index 5f690e9..0be7888 100644
--- a/include/db/mysqli.inc.php
+++ b/include/db/mysqli.inc.php
@@ -155,7 +155,7 @@ function serendipity_db_updated_rows() {
 
     preg_match(
         "/^[^0-9]+([0-9]+)[^0-9]+([0-9]+)[^0-9]+([0-9]+)/",
-        mysqli_info(),
+        mysqli_info($serendipity['dbConn']),
         $arr);
         // mysqli_affected_rows returns 0 if rows were matched but not changed.
         // mysqli_info returns rows matched
@@ -173,7 +173,7 @@ function serendipity_db_matched_rows() {
 
     preg_match(
         "/^[^0-9]+([0-9]+)[^0-9]+([0-9]+)[^0-9]+([0-9]+)/",
-        mysqli_info(),
+        mysqli_info($serendipity['dbConn']),
         $arr);
         // mysqli_affected_rows returns 0 if rows were matched but not changed.
         // mysqli_info returns rows matched
@@ -234,7 +234,7 @@ function serendipity_db_connect() {
     mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']);
 
     if (defined('SQL_CHARSET') && $serendipity['dbNames']) {
-        mysqli_query("SET NAMES " . SQL_CHARSET, $serendipity['dbConn']);
+        mysqli_query($serendipity['dbConn'], "SET NAMES " . SQL_CHARSET);
     }
 
     return $serendipity['dbConn'];