From d6992713fdb81b89651053df3b57c42c9fdf6d69 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Thu, 1 Mar 2018 08:24:48 -0500 Subject: [PATCH] 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 --- includes/specials/pagers/NewPagesPager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.20.1