From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 28 Jun 2019 20:22:11 +0000 (-0700)
Subject: rdbms: make FakeResultWrapper use get_object_vars() again
X-Git-Tag: 1.34.0-rc.0~1245^2
X-Git-Url: http://git.cyclocoop.org/%27http:/code.google.com/p/ie7-js/Three?a=commitdiff_plain;h=6c9fb706a3d44f113b1f96ee1a52014a4a49fd07;p=lhc%2Fweb%2Fwiklou.git

rdbms: make FakeResultWrapper use get_object_vars() again

get_object_vars() avoids a bug in older PHP versions where
string digit fields end up as string digit array keys instead
of proper integers, which can cause errors on access.

Follow up to d9f688698ce0

Change-Id: Ic93231e4a7244f49149ce9ed35fbcb1e04ac4065
---

diff --git a/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php b/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php
index 3709de7de2..2ca3d7d51b 100644
--- a/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php
+++ b/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php
@@ -35,7 +35,7 @@ class FakeResultWrapper extends ResultWrapper {
 
 		$this->next();
 
-		return is_object( $row ) ? (array)$row : $row;
+		return is_object( $row ) ? get_object_vars( $row ) : $row;
 	}
 
 	function seek( $pos ) {