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 d41f3e4..7c25d5a 100644 (file)
--- a/includes/db/DatabaseMysqli.php
+++ b/includes/db/DatabaseMysqli.php
@@ -244,6 +244,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
         */
        protected function mysqlFieldType( $res, $n ) {
                $field = $res->fetch_field_direct( $n );
+
                return $field->type;
        }
 
@@ -274,6 +275,10 @@ class DatabaseMysqli extends DatabaseMysqlBase {
         * @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 );
        }