From: Matěj Suchánek <matejsuchanek97@gmail.com>
Date: Thu, 2 Aug 2018 10:02:02 +0000 (+0200)
Subject: Sort allowed log actions when displaying
X-Git-Tag: 1.34.0-rc.0~3732^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=6404071d4e66068fbc0855363c62992aee510190;p=lhc%2Fweb%2Fwiklou.git

Sort allowed log actions when displaying

This makes searching in the dropdown on Special:ApiSandbox simpler
because it keeps actions of the same log type together.

Change-Id: I240f5e19938393d5c15a1f5e7dd27780957231c0
---

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 2d95cd3d18..3cb55e4169 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -388,6 +388,12 @@ class ApiQueryLogEvents extends ApiQueryBase {
 
 	public function getAllowedParams( $flags = 0 ) {
 		$config = $this->getConfig();
+		if ( $flags & ApiBase::GET_VALUES_FOR_HELP ) {
+			$logActions = $this->getAllowedLogActions();
+			sort( $logActions );
+		} else {
+			$logActions = null;
+		}
 		$ret = [
 			'prop' => [
 				ApiBase::PARAM_ISMULTI => true,
@@ -411,9 +417,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 			],
 			'action' => [
 				// validation on request is done in execute()
-				ApiBase::PARAM_TYPE => ( $flags & ApiBase::GET_VALUES_FOR_HELP )
-					? $this->getAllowedLogActions()
-					: null
+				ApiBase::PARAM_TYPE => $logActions
 			],
 			'start' => [
 				ApiBase::PARAM_TYPE => 'timestamp'