r78404 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78403‎ | r78404 | r78405 >
Date:22:45, 14 December 2010
Author:happy-melon
Status:ok
Tags:
Comment:
In the vein of r75313, get groups from the $wg(Add|Remove)Groups and $wgGroups(AddTo|RemoveFrom)Self variables as well.
Modified paths:
  • /trunk/phase3/includes/specials/SpecialListgrouprights.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialListgrouprights.php
@@ -60,12 +60,23 @@
6161 '</tr>'
6262 );
6363
64 - $allGroups = array_unique( array_merge( array_keys( $wgGroupPermissions ),
65 - array_keys( $wgRevokePermissions ) ) );
 64+ $allGroups = array_unique( array_merge(
 65+ array_keys( $wgGroupPermissions ),
 66+ array_keys( $wgRevokePermissions ),
 67+ array_keys( $wgAddGroups ),
 68+ array_keys( $wgRemoveGroups ),
 69+ array_keys( $wgGroupsAddToSelf ),
 70+ array_keys( $wgGroupsRemoveFromSelf )
 71+ ) );
 72+ asort( $allGroups );
 73+
6674 foreach ( $allGroups as $group ) {
67 - $permissions = isset( $wgGroupPermissions[$group] ) ?
68 - $wgGroupPermissions[$group] : array();
69 - $groupname = ( $group == '*' ) ? 'all' : $group; // Replace * with a more descriptive groupname
 75+ $permissions = isset( $wgGroupPermissions[$group] )
 76+ ? $wgGroupPermissions[$group]
 77+ : array();
 78+ $groupname = ( $group == '*' ) // Replace * with a more descriptive groupname
 79+ ? 'all'
 80+ : $group;
7081
7182 $msg = wfMsg( 'group-' . $groupname );
7283 if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r784371.17: Merge tagged revisions from trunk: r77878, r77981, r77982, r77994, r780...catrope14:14, 15 December 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r75313(bug 23934) Groups defined in $wgRevokePermissions but not in $wgGroupPermiss...btongminh15:24, 24 October 2010

Status & tagging log