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

diff --git a/includes/changes/ChangesListFilterGroup.php b/includes/changes/ChangesListFilterGroup.php
index 5762752..e9140da 100644 (file)
--- 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'],