jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382295 )
Change subject: RCFilters: Avoid adding raw filter and group objects to js vars
......................................................................
RCFilters: Avoid adding raw filter and group objects to js vars
Bug: T176236
Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
(cherry picked from commit dbc83d9c431f65da38e23170912e8a3f3f0ef3c3)
---
M includes/changes/ChangesListFilterGroup.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
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/382295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c68ea0e090cfb065d2e3e8acad7025c61c344ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.2
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
