| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1852,26 +1852,6 @@ |
| 1853 | 1853 | array_keys( $wgGroupPermissions ), |
| 1854 | 1854 | array( '*', 'user', 'autoconfirmed' ) ); |
| 1855 | 1855 | } |
| 1856 | | - |
| 1857 | | - /** |
| 1858 | | - * Return the set of groups which are not marked "invisible" |
| 1859 | | - * @return array |
| 1860 | | - * @static |
| 1861 | | - */ |
| 1862 | | - function getVisibleGroups() { |
| 1863 | | - global $wgGroupPermissions, $wgInvisibleGroups; |
| 1864 | | - return array_diff( User::getAllGroups(), $wgInvisibleGroups ); |
| 1865 | | - } |
| 1866 | | - |
| 1867 | | - /** |
| 1868 | | - * Determine if a given group name is a valid, visible group |
| 1869 | | - * @param string name |
| 1870 | | - * @return bool |
| 1871 | | - */ |
| 1872 | | - function isVisibleGroup( $group ) { |
| 1873 | | - global $wgGroupPermissions, $wgInvisibleGroups; |
| 1874 | | - return isset( $wgGroupPermissions[$group] ) && !in_array( $group, $wgInvisibleGroups ); |
| 1875 | | - } |
| 1876 | 1856 | } |
| 1877 | 1857 | |
| 1878 | 1858 | ?> |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -847,11 +847,6 @@ |
| 848 | 848 | # $wgGroupPermissions['developer']['siteadmin'] = true; |
| 849 | 849 | |
| 850 | 850 | /** |
| 851 | | - * List of groups which won't appear in Special:Listusers |
| 852 | | - */ |
| 853 | | -$wgInvisibleGroups = array(); |
| 854 | | - |
| 855 | | -/** |
| 856 | 851 | * Set of available actions that can be restricted via Special:Protect |
| 857 | 852 | * You probably shouldn't change this. |
| 858 | 853 | */ |
| Index: trunk/phase3/includes/SpecialListusers.php |
| — | — | @@ -89,7 +89,7 @@ |
| 90 | 90 | wfMsgHtml( 'groups-editgroup-name' ) . '<select name="group">'; |
| 91 | 91 | |
| 92 | 92 | // get group names |
| 93 | | - $groups = User::getVisibleGroups(); |
| | 93 | + $groups = User::getAllGroups(); |
| 94 | 94 | |
| 95 | 95 | // we want a default empty group |
| 96 | 96 | $out.= '<option value=""></option>'; |
| — | — | @@ -185,9 +185,7 @@ |
| 186 | 186 | 'ListUsersPage::formatResult' ); |
| 187 | 187 | $groups = array(); |
| 188 | 188 | while( $row = $dbr->fetchObject( $result ) ) { |
| 189 | | - if ( User::isVisibleGroup( $row->ug_group ) ) { |
| 190 | | - $groups[] = User::getGroupName( $row->ug_group ); |
| 191 | | - } |
| | 189 | + $groups[] = User::getGroupName( $row->ug_group ); |
| 192 | 190 | } |
| 193 | 191 | $dbr->freeResult( $result ); |
| 194 | 192 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -341,7 +341,6 @@ |
| 342 | 342 | * (bug 3192): properly check 'limit' parameter on Special:Contributions |
| 343 | 343 | * (bug 3187) watchlist text refer to unexistent "Stop watching" action |
| 344 | 344 | * Add block link and a link to the block log to Special:Contributions |
| 345 | | -* Added $wgInvisibleGroups, to hide groups from Special:Listusers |
| 346 | 345 | * Add contributions link to block log items |
| 347 | 346 | |
| 348 | 347 | Misc.: |