Sbisson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382169 )

Change subject: RCFilters: unset raw filter and group objects before adding 
them to js var structure
......................................................................

RCFilters: unset raw filter and group objects before adding them to js var 
structure

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/382169/1

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

-- 
To view, visit https://gerrit.wikimedia.org/r/382169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to