http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61873
Revision: 61873 Author: ialex Date: 2010-02-02 20:45:35 +0000 (Tue, 02 Feb 2010) Log Message: ----------- * (bug 21593) Special:UserRights now lists automatic groups membership Modified Paths: -------------- trunk/phase3/RELEASE-NOTES trunk/phase3/includes/specials/SpecialUserrights.php trunk/phase3/languages/messages/MessagesEn.php trunk/phase3/maintenance/language/messages.inc Modified: trunk/phase3/RELEASE-NOTES =================================================================== --- trunk/phase3/RELEASE-NOTES 2010-02-02 20:44:22 UTC (rev 61872) +++ trunk/phase3/RELEASE-NOTES 2010-02-02 20:45:35 UTC (rev 61873) @@ -734,6 +734,7 @@ 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 == Modified: trunk/phase3/includes/specials/SpecialUserrights.php =================================================================== --- trunk/phase3/includes/specials/SpecialUserrights.php 2010-02-02 20:44:22 UTC (rev 61872) +++ trunk/phase3/includes/specials/SpecialUserrights.php 2010-02-02 20:45:35 UTC (rev 61873) @@ -403,11 +403,22 @@ 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' ) ) . Xml::hidden( 'user', $this->mTarget ) . Modified: trunk/phase3/languages/messages/MessagesEn.php =================================================================== --- trunk/phase3/languages/messages/MessagesEn.php 2010-02-02 20:44:22 UTC (rev 61872) +++ trunk/phase3/languages/messages/MessagesEn.php 2010-02-02 20:45:35 UTC (rev 61873) @@ -1801,6 +1801,7 @@ '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. Modified: trunk/phase3/maintenance/language/messages.inc =================================================================== --- trunk/phase3/maintenance/language/messages.inc 2010-02-02 20:44:22 UTC (rev 61872) +++ trunk/phase3/maintenance/language/messages.inc 2010-02-02 20:45:35 UTC (rev 61873) @@ -977,6 +977,7 @@ 'userrights-editusergroup', 'saveusergroups', 'userrights-groupsmember', + 'userrights-groupsmember-auto', 'userrights-groups-help', 'userrights-reason', 'userrights-no-interwiki', _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs