Merge "Only pass strings to mysqli::real_escape_string"

[lhc/web/wiklou.git] / includes / db / DatabaseMysqli.php

diff --git a/includes/db/DatabaseMysqli.php b/includes/db/DatabaseMysqli.php
index 6c83adb..7c25d5a 100644 (file)
--- a/includes/db/DatabaseMysqli.php
+++ b/includes/db/DatabaseMysqli.php
@@ -30,7 +30,7 @@
  */
 class DatabaseMysqli extends DatabaseMysqlBase {
        /**
-        * @param $sql string
+        * @param string $sql
         * @return resource
         */
        protected function doQuery( $sql ) {
@@ -43,7 +43,13 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return $ret;
        }
 
+       /**
+        * @param string $realServer
+        * @return bool|mysqli
+        * @throws DBConnectionError
+        */
        protected function mysqlConnect( $realServer ) {
+               global $wgDBmysql5;
                # Fail now
                # Otherwise we get a suppressed fatal error, which is very hard to track down
                if ( !function_exists( 'mysqli_init' ) ) {
@@ -63,8 +69,15 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                }
 
                $mysqli = mysqli_init();
-               $numAttempts = 2;
+               if ( $wgDBmysql5 ) {
+                       // Tell the server we're communicating with it in UTF-8.
+                       // This may engage various charset conversions.
+                       $mysqli->options( MYSQLI_SET_CHARSET_NAME, 'utf8' );
+               } else {
+                       $mysqli->options( MYSQLI_SET_CHARSET_NAME, 'binary' );
+               }
 
+               $numAttempts = 2;
                for ( $i = 0; $i < $numAttempts; $i++ ) {
                        if ( $i > 1 ) {
                                usleep( 1000 );
@@ -79,7 +92,13 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return false;
        }
 
+       protected function connectInitCharset() {
+               // already done in mysqlConnect()
+               return true;
+       }
+
        /**
+        * @param string $charset
         * @return bool
         */
        protected function mysqlSetCharset( $charset ) {
@@ -123,7 +142,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
        }
 
        /**
-        * @param $db
+        * @param string $db
         * @return bool
         */
        function selectDB( $db ) {
@@ -139,12 +158,20 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return $this->mConn->server_info;
        }
 
+       /**
+        * @param mysqli $res
+        * @return bool
+        */
        protected function mysqlFreeResult( $res ) {
                $res->free_result();
 
                return true;
        }
 
+       /**
+        * @param mysqli $res
+        * @return bool
+        */
        protected function mysqlFetchObject( $res ) {
                $object = $res->fetch_object();
                if ( $object === null ) {
@@ -154,6 +181,10 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return $object;
        }
 
+       /**
+        * @param mysqli $res
+        * @return bool
+        */
        protected function mysqlFetchArray( $res ) {
                $array = $res->fetch_array();
                if ( $array === null ) {
@@ -163,14 +194,27 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return $array;
        }
 
+       /**
+        * @param mysqli $res
+        * @return mixed
+        */
        protected function mysqlNumRows( $res ) {
                return $res->num_rows;
        }
 
+       /**
+        * @param mysqli $res
+        * @return mixed
+        */
        protected function mysqlNumFields( $res ) {
                return $res->field_count;
        }
 
+       /**
+        * @param mysqli $res
+        * @param int $n
+        * @return mixed
+        */
        protected function mysqlFetchField( $res, $n ) {
                $field = $res->fetch_field_direct( $n );
                $field->not_null = $field->flags & MYSQLI_NOT_NULL_FLAG;
@@ -182,21 +226,41 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                return $field;
        }
 
+       /**
+        * @param resource|ResultWrapper $res
+        * @param int $n
+        * @return mixed
+        */
        protected function mysqlFieldName( $res, $n ) {
                $field = $res->fetch_field_direct( $n );
 
                return $field->name;
        }
 
+       /**
+        * @param resource|ResultWrapper $res
+        * @param int $n
+        * @return mixed
+        */
        protected function mysqlFieldType( $res, $n ) {
                $field = $res->fetch_field_direct( $n );
+
                return $field->type;
        }
 
+       /**
+        * @param resource|ResultWrapper $res
+        * @param int $row
+        * @return mixed
+        */
        protected function mysqlDataSeek( $res, $row ) {
                return $res->data_seek( $row );
        }
 
+       /**
+        * @param mysqli $conn Optional connection object
+        * @return string
+        */
        protected function mysqlError( $conn = null ) {
                if ( $conn === null ) {
                        return mysqli_connect_error();
@@ -205,7 +269,16 @@ class DatabaseMysqli extends DatabaseMysqlBase {
                }
        }
 
+       /**
+        * Escapes special characters in a string for use in an SQL statement
+        * @param string $s
+        * @return string
+        */
        protected function mysqlRealEscapeString( $s ) {
+               if ( is_integer( $s ) ) {
+                       // HHVM fatals passing numbers to real_escape_string
+                       $s = (string) $s;
+               }
                return $this->mConn->real_escape_string( $s );
        }