From a119a58be84e9e34181ec952be201af2672677f9 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 2 Feb 2010 20:45:35 +0000
Subject: [PATCH] * (bug 21593) Special:UserRights now lists automatic groups
 membership

---
 RELEASE-NOTES                           |  1 +
 includes/specials/SpecialUserrights.php | 13 ++++++++++++-
 languages/messages/MessagesEn.php       |  1 +
 maintenance/language/messages.inc       |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 17b8ea3a4e..f35e83b23a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -734,6 +734,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   not 'File:Foo' when Foo is not an image
 * (bug 21518) Special:UserRights no longer displays the user name box for users
   that can only change their rights
+* (bug 21593) Special:UserRights now lists automatic groups membership
 
 == API changes in 1.16 ==
 
diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 59dabf90c4..2e2e9621c2 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -403,10 +403,21 @@ class UserrightsPage extends SpecialPage {
 		foreach( $groups as $group )
 			$list[] = self::buildGroupLink( $group );
 
+		$autolist = array();
+		if ( $user instanceof User ) {
+			foreach( Autopromote::getAutopromoteGroups( $user ) as $group ) {
+				$autolist[] = self::buildGroupLink( $group );
+			}
+		}
+
 		$grouplist = '';
 		if( count( $list ) > 0 ) {
 			$grouplist = wfMsgHtml( 'userrights-groupsmember' );
-			$grouplist = '<p>' . $grouplist  . ' ' . $wgLang->listToText( $list ) . '</p>';
+			$grouplist = '<p>' . $grouplist  . ' ' . $wgLang->listToText( $list ) . "</p>\n";
+		}
+		if( count( $autolist ) > 0 ) {
+			$autogrouplistintro = wfMsgHtml( 'userrights-groupsmember-auto' );
+			$grouplist .= '<p>' . $autogrouplistintro  . ' ' . $wgLang->listToText( $autolist ) . "</p>\n";
 		}
 		$wgOut->addHTML(
 			Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalURL(), 'name' => 'editGroup', 'id' => 'mw-userrights-form2' ) ) .
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 87e9fc5906..5983135637 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1801,6 +1801,7 @@ You can also choose to let others contact you through your user or talk page wit
 'userrights-editusergroup'       => 'Edit user groups',
 'saveusergroups'                 => 'Save user groups',
 'userrights-groupsmember'        => 'Member of:',
+'userrights-groupsmember-auto'   => 'Implicit member of:',
 'userrights-groups-help'         => 'You may alter the groups this user is in:
 * A checked box means the user is in that group.
 * An unchecked box means the user is not in that group.
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index c1362d3983..cb87bcc1ed 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -977,6 +977,7 @@ $wgMessageStructure = array(
 		'userrights-editusergroup',
 		'saveusergroups',
 		'userrights-groupsmember',
+		'userrights-groupsmember-auto',
 		'userrights-groups-help',
 		'userrights-reason',
 		'userrights-no-interwiki',
-- 
2.20.1