jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364337 )
Change subject: Do not override other flags on enhanced recent changes ...................................................................... Do not override other flags on enhanced recent changes Any non-core flags need to stay untouched, so that the grouping algorithm works correctly. Bug: T169181 Change-Id: Iecdd79480691b5092a833e19360e8e5f50b48db2 (cherry picked from commit 9c78855dc82cd447e49ad6db45de77028786f5d7) --- M Hooks.php 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/Hooks.php b/Hooks.php index f139b26..6073e60 100644 --- a/Hooks.php +++ b/Hooks.php @@ -554,7 +554,10 @@ $formatter = Container::get( 'formatter.changeslist' ); try { $data['timestampLink'] = $formatter->getTimestampLink( $row, $changesList ); - $data['recentChangesFlags'] = $formatter->getFlags( $row, $changesList ); + $data['recentChangesFlags'] = array_merge( + $data['recentChangesFlags'], + $formatter->getFlags( $row, $changesList ) + ); if ( $classes ) { $classes[] = 'mw-changeslist-src-mw-edit'; } -- To view, visit https://gerrit.wikimedia.org/r/364337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecdd79480691b5092a833e19360e8e5f50b48db2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: wmf/1.30.0-wmf.7 Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchane...@gmail.com> Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits