| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -977,6 +977,7 @@ |
| 978 | 978 | 'userrights-editusergroup', |
| 979 | 979 | 'saveusergroups', |
| 980 | 980 | 'userrights-groupsmember', |
| | 981 | + 'userrights-groupsmember-auto', |
| 981 | 982 | 'userrights-groups-help', |
| 982 | 983 | 'userrights-reason', |
| 983 | 984 | 'userrights-no-interwiki', |
| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -403,11 +403,22 @@ |
| 404 | 404 | foreach( $groups as $group ) |
| 405 | 405 | $list[] = self::buildGroupLink( $group ); |
| 406 | 406 | |
| | 407 | + $autolist = array(); |
| | 408 | + if ( $user instanceof User ) { |
| | 409 | + foreach( Autopromote::getAutopromoteGroups( $user ) as $group ) { |
| | 410 | + $autolist[] = self::buildGroupLink( $group ); |
| | 411 | + } |
| | 412 | + } |
| | 413 | + |
| 407 | 414 | $grouplist = ''; |
| 408 | 415 | if( count( $list ) > 0 ) { |
| 409 | 416 | $grouplist = wfMsgHtml( 'userrights-groupsmember' ); |
| 410 | | - $grouplist = '<p>' . $grouplist . ' ' . $wgLang->listToText( $list ) . '</p>'; |
| | 417 | + $grouplist = '<p>' . $grouplist . ' ' . $wgLang->listToText( $list ) . "</p>\n"; |
| 411 | 418 | } |
| | 419 | + if( count( $autolist ) > 0 ) { |
| | 420 | + $autogrouplistintro = wfMsgHtml( 'userrights-groupsmember-auto' ); |
| | 421 | + $grouplist .= '<p>' . $autogrouplistintro . ' ' . $wgLang->listToText( $autolist ) . "</p>\n"; |
| | 422 | + } |
| 412 | 423 | $wgOut->addHTML( |
| 413 | 424 | Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalURL(), 'name' => 'editGroup', 'id' => 'mw-userrights-form2' ) ) . |
| 414 | 425 | Xml::hidden( 'user', $this->mTarget ) . |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1801,6 +1801,7 @@ |
| 1802 | 1802 | 'userrights-editusergroup' => 'Edit user groups', |
| 1803 | 1803 | 'saveusergroups' => 'Save user groups', |
| 1804 | 1804 | 'userrights-groupsmember' => 'Member of:', |
| | 1805 | +'userrights-groupsmember-auto' => 'Implicit member of:', |
| 1805 | 1806 | 'userrights-groups-help' => 'You may alter the groups this user is in: |
| 1806 | 1807 | * A checked box means the user is in that group. |
| 1807 | 1808 | * An unchecked box means the user is not in that group. |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -734,6 +734,7 @@ |
| 735 | 735 | not 'File:Foo' when Foo is not an image |
| 736 | 736 | * (bug 21518) Special:UserRights no longer displays the user name box for users |
| 737 | 737 | that can only change their rights |
| | 738 | +* (bug 21593) Special:UserRights now lists automatic groups membership |
| 738 | 739 | |
| 739 | 740 | == API changes in 1.16 == |
| 740 | 741 | |