diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2020-01-07 00:01:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2020-01-07 00:01:46 +0000 |
| commit | 40576f59dd22e7b18615c76587d273b3ab1523bd (patch) | |
| tree | 9c155a59daea30797ed7bfed8c39c0e5c7d1b645 | |
| parent | 2c060939bff0a6cb02e48cf22d8adadc0c690a97 (diff) | |
| parent | 75ff49a1ffcef0fdd27e6bf8d6421210413cfed4 (diff) | |
| download | mediawikicore-40576f59dd22e7b18615c76587d273b3ab1523bd.tar.gz mediawikicore-40576f59dd22e7b18615c76587d273b3ab1523bd.zip | |
Merge "Sort user groups when shown in drop-downs"
| -rw-r--r-- | includes/api/ApiQueryAllUsers.php | 6 | ||||
| -rw-r--r-- | includes/api/ApiQueryContributors.php | 6 | ||||
| -rw-r--r-- | includes/api/ApiUserrights.php | 12 | ||||
| -rw-r--r-- | includes/specials/SpecialActiveUsers.php | 2 |
4 files changed, 20 insertions, 6 deletions
diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index 309a167b73ea..216749cae43c 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -326,9 +326,13 @@ class ApiQueryAllUsers extends ApiQueryBase { return 'anon-public-user-private'; } - public function getAllowedParams() { + public function getAllowedParams( $flags = 0 ) { $userGroups = User::getAllGroups(); + if ( $flags & ApiBase::GET_VALUES_FOR_HELP ) { + sort( $userGroups ); + } + return [ 'from' => null, 'to' => null, diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php index f2e306fe8352..ea5b7c313a2c 100644 --- a/includes/api/ApiQueryContributors.php +++ b/includes/api/ApiQueryContributors.php @@ -223,10 +223,14 @@ class ApiQueryContributors extends ApiQueryBase { return 'public'; } - public function getAllowedParams() { + public function getAllowedParams( $flags = 0 ) { $userGroups = User::getAllGroups(); $userRights = $this->getPermissionManager()->getAllPermissions(); + if ( $flags & ApiBase::GET_VALUES_FOR_HELP ) { + sort( $userGroups ); + } + return [ 'group' => [ ApiBase::PARAM_TYPE => $userGroups, diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php index 3aaae70483c1..bfb2256b8c9a 100644 --- a/includes/api/ApiUserrights.php +++ b/includes/api/ApiUserrights.php @@ -160,7 +160,13 @@ class ApiUserrights extends ApiBase { return true; } - public function getAllowedParams() { + public function getAllowedParams( $flags = 0 ) { + $allGroups = $this->getAllGroups(); + + if ( $flags & ApiBase::GET_VALUES_FOR_HELP ) { + sort( $allGroups ); + } + $a = [ 'user' => [ ApiBase::PARAM_TYPE => 'user', @@ -169,7 +175,7 @@ class ApiUserrights extends ApiBase { ApiBase::PARAM_TYPE => 'integer', ], 'add' => [ - ApiBase::PARAM_TYPE => $this->getAllGroups(), + ApiBase::PARAM_TYPE => $allGroups, ApiBase::PARAM_ISMULTI => true ], 'expiry' => [ @@ -178,7 +184,7 @@ class ApiUserrights extends ApiBase { ApiBase::PARAM_DFLT => 'infinite', ], 'remove' => [ - ApiBase::PARAM_TYPE => $this->getAllGroups(), + ApiBase::PARAM_TYPE => $allGroups, ApiBase::PARAM_ISMULTI => true ], 'reason' => [ diff --git a/includes/specials/SpecialActiveUsers.php b/includes/specials/SpecialActiveUsers.php index 7995e3ef92b2..0f072248638a 100644 --- a/includes/specials/SpecialActiveUsers.php +++ b/includes/specials/SpecialActiveUsers.php @@ -84,7 +84,7 @@ class SpecialActiveUsers extends SpecialPage { $msg = htmlspecialchars( UserGroupMembership::getGroupName( $group ) ); $options[$msg] = $group; } - asort( $options ); + ksort( $options ); // Backwards-compatibility with old URLs $req = $this->getRequest(); |