From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Thu, 1 Mar 2018 13:24:48 +0000 (-0500)
Subject: NewPagesPages: Use array_merge rather than + for RC query info fields
X-Git-Tag: 1.31.0-rc.0~478
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=d6992713fdb81b89651053df3b57c42c9fdf6d69;p=lhc%2Fweb%2Fwiklou.git

NewPagesPages: Use array_merge rather than + for RC query info fields

Unlike CommentStore::getJoin() and ActorMigration::getJoin(), the tables
and fields of various ::getQueryInfo() methods aren't guaranteed to be
safe to use with array '+'.

Bug: T188555
Change-Id: Ibe99edcb93d1729935fed6232ba4fe2e7d39cea6
---

diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php
index 974633406d..efdc75a344 100644
--- a/includes/specials/pagers/NewPagesPager.php
+++ b/includes/specials/pagers/NewPagesPager.php
@@ -95,9 +95,9 @@ class NewPagesPager extends ReverseChronologicalPager {
 
 		// Allow changes to the New Pages query
 		$tables = array_merge( $rcQuery['tables'], [ 'page' ] );
-		$fields = [
+		$fields = array_merge( $rcQuery['fields'], [
 			'length' => 'page_len', 'rev_id' => 'page_latest', 'page_namespace', 'page_title'
-		] + $rcQuery['fields'];
+		] );
 		$join_conds = [ 'page' => [ 'INNER JOIN', 'page_id=rc_cur_id' ] ] + $rcQuery['joins'];
 
 		// Avoid PHP 7.1 warning from passing $this by reference