RCFilters: Avoid adding raw filter and group objects to js vars
authorStephane Bisson <sbisson@wikimedia.org>
Wed, 4 Oct 2017 15:06:16 +0000 (11:06 -0400)
committerStephane Bisson <sbisson@wikimedia.org>
Wed, 4 Oct 2017 15:08:51 +0000 (11:08 -0400)
Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca

includes/changes/ChangesListFilterGroup.php

index 5762752..e9140da 100644 (file)
@@ -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'],