From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Mon, 7 May 2012 13:52:55 +0000 (+0200)
Subject: (bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater
X-Git-Tag: 1.31.0-rc.0~23687^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_modifier.php?a=commitdiff_plain;h=1d3934e1ad1dc914d0713c2107b8f2810a606271;p=lhc%2Fweb%2Fwiklou.git

(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater

No RELEASE-NOTES entry since this is going to be backported and RELEASE-NOTES-1.19 is out of sync.

Change-Id: I1ec6c824677606ac6f93cc43345942e4de8bd3f4
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 56f17d86b6..6eb51afc75 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1475,6 +1475,7 @@ abstract class DatabaseBase implements DatabaseType {
 	function selectRow( $table, $vars, $conds, $fname = 'DatabaseBase::selectRow',
 		$options = array(), $join_conds = array() )
 	{
+		$options = (array)$options;
 		$options['LIMIT'] = 1;
 		$res = $this->select( $table, $vars, $conds, $fname, $options, $join_conds );