jenkins-bot has submitted this change and it was merged.
Change subject: Reduce duplication in some Special:ListGroupRights code
......................................................................
Reduce duplication in some Special:ListGroupRights code
Change-Id: I05bf9f3eef5f71d2d3789c8a6a1aff09ac46c14e
---
M includes/specials/SpecialListgrouprights.php
1 file changed, 23 insertions(+), 48 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialListgrouprights.php
b/includes/specials/SpecialListgrouprights.php
index 5bae28f..8b9a0ee 100644
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -235,20 +235,18 @@
foreach ( $permissions as $permission => $granted ) {
//show as granted only if it isn't revoked to prevent
duplicate display of permissions
if ( $granted && ( !isset( $revoke[$permission] ) ||
!$revoke[$permission] ) ) {
- $description = $this->msg(
'listgrouprights-right-display',
+ $r[] = $this->msg(
'listgrouprights-right-display',
User::getRightDescription( $permission
),
'<span
class="mw-listgrouprights-right-name">' . $permission . '</span>'
)->parse();
- $r[] = $description;
}
}
foreach ( $revoke as $permission => $revoked ) {
if ( $revoked ) {
- $description = $this->msg(
'listgrouprights-right-revoked',
+ $r[] = $this->msg(
'listgrouprights-right-revoked',
User::getRightDescription( $permission
),
'<span
class="mw-listgrouprights-right-name">' . $permission . '</span>'
)->parse();
- $r[] = $description;
}
}
@@ -257,51 +255,28 @@
$lang = $this->getLanguage();
$allGroups = User::getAllGroups();
- if ( $add === true ) {
- $r[] = $this->msg( 'listgrouprights-addgroup-all'
)->escaped();
- } elseif ( is_array( $add ) ) {
- $add = array_intersect( array_values( array_unique(
$add ) ), $allGroups );
- if ( count( $add ) ) {
- $r[] = $this->msg( 'listgrouprights-addgroup',
- $lang->listToText( array_map( array(
'User', 'makeGroupLinkWiki' ), $add ) ),
- count( $add )
- )->parse();
- }
- }
+ $changeGroups = array(
+ 'addgroup' => $add,
+ 'removegroup' => $remove,
+ 'addgroup-self' => $addSelf,
+ 'removegroup-self' => $removeSelf
+ );
- if ( $remove === true ) {
- $r[] = $this->msg( 'listgrouprights-removegroup-all'
)->escaped();
- } elseif ( is_array( $remove ) ) {
- $remove = array_intersect( array_values( array_unique(
$remove ) ), $allGroups );
- if ( count( $remove ) ) {
- $r[] = $this->msg(
'listgrouprights-removegroup',
- $lang->listToText( array_map( array(
'User', 'makeGroupLinkWiki' ), $remove ) ),
- count( $remove )
- )->parse();
- }
- }
-
- if ( $addSelf === true ) {
- $r[] = $this->msg( 'listgrouprights-addgroup-self-all'
)->escaped();
- } elseif ( is_array( $addSelf ) ) {
- $addSelf = array_intersect( array_values( array_unique(
$addSelf ) ), $allGroups );
- if ( count( $addSelf ) ) {
- $r[] = $this->msg(
'listgrouprights-addgroup-self',
- $lang->listToText( array_map( array(
'User', 'makeGroupLinkWiki' ), $addSelf ) ),
- count( $addSelf )
- )->parse();
- }
- }
-
- if ( $removeSelf === true ) {
- $r[] = $this->msg(
'listgrouprights-removegroup-self-all' )->parse();
- } elseif ( is_array( $removeSelf ) ) {
- $removeSelf = array_intersect( array_values(
array_unique( $removeSelf ) ), $allGroups );
- if ( count( $removeSelf ) ) {
- $r[] = $this->msg(
'listgrouprights-removegroup-self',
- $lang->listToText( array_map( array(
'User', 'makeGroupLinkWiki' ), $removeSelf ) ),
- count( $removeSelf )
- )->parse();
+ foreach ( $changeGroups as $messageKey => $changeGroup ) {
+ if ( $changeGroup === true ) {
+ // For grep: listgrouprights-addgroup-all,
listgrouprights-removegroup-all,
+ // listgrouprights-addgroup-self-all,
listgrouprights-removegroup-self-all
+ $r[] = $this->msg( 'listgrouprights-' .
$messageKey . '-all' )->escaped();
+ } elseif ( is_array( $changeGroup ) ) {
+ $changeGroup = array_intersect( array_values(
array_unique( $changeGroup ) ), $allGroups );
+ if ( count( $changeGroup ) ) {
+ // For grep: listgrouprights-addgroup,
listgrouprights-removegroup,
+ // listgrouprights-addgroup-self,
listgrouprights-removegroup-self
+ $r[] = $this->msg( 'listgrouprights-' .
$messageKey,
+ $lang->listToText( array_map(
array( 'User', 'makeGroupLinkWiki' ), $changeGroup ) ),
+ count( $changeGroup )
+ )->parse();
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/162023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05bf9f3eef5f71d2d3789c8a6a1aff09ac46c14e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[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
