From: Chad <chadh@wikimedia.org>
Date: Mon, 10 Feb 2014 19:58:22 +0000 (+0000)
Subject: Revert "Only pass strings to mysqli::real_escape_string"
X-Git-Tag: 1.31.0-rc.0~16963^2
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=950b9b941f45efe937f8e9d9487aba228e4f271c;p=lhc%2Fweb%2Fwiklou.git

Revert "Only pass strings to mysqli::real_escape_string"

hhvm already has a patch in master for fixing this, making the workaround unnecessary

This reverts commit de808f57a90c9c6f7bc4dbc4e4b544a07e0daa0f.

Change-Id: I504e5bd5025ec12430ce670e05da0158b06822c9
---

diff --git a/includes/db/DatabaseMysqli.php b/includes/db/DatabaseMysqli.php
index 290de1f4ce..d41f3e4c69 100644
--- a/includes/db/DatabaseMysqli.php
+++ b/includes/db/DatabaseMysqli.php
@@ -274,10 +274,6 @@ 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 );
 	}