jenkins-bot has submitted this change and it was merged. Change subject: Don't let AFT set unsupported groups ......................................................................
Don't let AFT set unsupported groups E.g.: dewiki is a wiki without rollbacker group, but on https://de.wikipedia.org/wiki/Spezial:Gruppenrechte a group rollbacker with aftv5 rights exist, which is not needed and confusing. Change-Id: I95328bd615aaca9cd1adb51e6f85f077d0b8cc9b --- M ArticleFeedbackv5.php 1 file changed, 14 insertions(+), 17 deletions(-) Approvals: Umherirrender: Looks good to me, but someone else must approve Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php index 36b8a11..faff7f5 100644 --- a/ArticleFeedbackv5.php +++ b/ArticleFeedbackv5.php @@ -483,23 +483,20 @@ // Permissions: 6 levels of permissions are built into ArticleFeedbackv5: reader, member, editor, // monitor, administrator, oversighter. The default (below-configured) permissions scheme can be seen at // http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Access_and_permissions -foreach ( array( '*', 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ) as $group ) { - $wgGroupPermissions[$group]['aft-reader'] = true; -} -foreach ( array( 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ) as $group ) { - $wgGroupPermissions[$group]['aft-member'] = true; -} -foreach ( array( 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ) as $group ) { - $wgGroupPermissions[$group]['aft-editor'] = true; -} -foreach ( array( 'rollbacker', 'reviewer', 'sysop', 'oversight' ) as $group ) { - $wgGroupPermissions[$group]['aft-monitor'] = true; -} -foreach ( array( 'sysop', 'oversight' ) as $group ) { - $wgGroupPermissions[$group]['aft-administrator'] = true; -} -foreach ( array( 'oversight' ) as $group ) { - $wgGroupPermissions[$group]['aft-oversighter'] = true; +$wgArticleFeedbackv5DefaultPermissions = array( + 'aft-reader' => array( '*', 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ), + 'aft-member' => array( 'user', 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ), + 'aft-editor' => array( 'confirmed', 'autoconfirmed', 'rollbacker', 'reviewer', 'sysop', 'oversight' ), + 'aft-monitor' => array( 'rollbacker', 'reviewer', 'sysop', 'oversight' ), + 'aft-administrator' => array( 'sysop', 'oversight' ), + 'aft-oversighter' => array( 'oversight' ), +); +foreach ( $wgArticleFeedbackv5DefaultPermissions as $permission => $groups ) { + foreach ( (array) $groups as $group ) { + if ( isset( $wgGroupPermissions[$group] ) ) { + $wgGroupPermissions[$group][$permission] = true; + } + } } // register resources with ResourceLoader -- To view, visit https://gerrit.wikimedia.org/r/42537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95328bd615aaca9cd1adb51e6f85f077d0b8cc9b Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: Bsitu <[email protected]> Gerrit-Reviewer: Kaldari <[email protected]> Gerrit-Reviewer: Matthias Mullie <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Se4598 <[email protected]> Gerrit-Reviewer: Umherirrender <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
