From: Stephane Bisson <sbisson@wikimedia.org>
Date: Wed, 4 Oct 2017 15:06:16 +0000 (-0400)
Subject: RCFilters: Avoid adding raw filter and group objects to js vars
X-Git-Tag: 1.31.0-rc.0~1878^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=dbc83d9c431f65da38e23170912e8a3f3f0ef3c3;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Avoid adding raw filter and group objects to js vars

Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
---

diff --git a/includes/changes/ChangesListFilterGroup.php b/includes/changes/ChangesListFilterGroup.php
index 57627525a3..e9140da209 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -394,9 +394,9 @@ abstract class ChangesListFilterGroup {
 		);
 
 		foreach ( $conflicts as $conflictInfo ) {
-			$output['conflicts'][] = $conflictInfo;
 			unset( $conflictInfo['filterObject'] );
 			unset( $conflictInfo['groupObject'] );
+			$output['conflicts'][] = $conflictInfo;
 			array_push(
 				$output['messageKeys'],
 				$conflictInfo['globalDescription'],