(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 56f17d8..6eb51af 100644 (file)
--- 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 );