From dbc83d9c431f65da38e23170912e8a3f3f0ef3c3 Mon Sep 17 00:00:00 2001
From: Stephane Bisson <sbisson@wikimedia.org>
Date: Wed, 4 Oct 2017 11:06:16 -0400
Subject: [PATCH] RCFilters: Avoid adding raw filter and group objects to js
 vars

Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
---
 includes/changes/ChangesListFilterGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'],
-- 
2.20.1