(bug 23934) Groups defined in $wgRevokePermissions but not in $wgGroupPermissions...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 50d6c46..81594ba 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -360,6 +360,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 25462) Fix double-escaping for section edit link tooltips
 * action=raw was removed for Special:Statistics. This information is still
   available via the API
+* (bug 23934) Groups defined in $wgRevokePermissions but not in
+  $wgGroupPermissions now appear on Special:ListGroupRights
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php
index e1294a9..072b37d 100644 (file)
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -60,7 +60,11 @@ class SpecialListGroupRights extends SpecialPage {
                                '</tr>'
                );
 
-               foreach( $wgGroupPermissions as $group => $permissions ) {
+               $allGroups = array_merge( array_keys( $wgGroupPermissions ), 
+                               array_keys( $wgRevokePermissions ) );
+               foreach ( $allGroups as $group ) {
+                       $permissions = isset( $wgGroupPermissions[$group] ) ? 
+                                       $wgGroupPermissions[$group] : array();
                        $groupname = ( $group == '*' ) ? 'all' : $group; // Replace * with a more descriptive groupname
 
                        $msg = wfMsg( 'group-' . $groupname );