From: Marius Hoch <hoo@online.de>
Date: Sun, 28 Dec 2014 11:51:12 +0000 (+0100)
Subject: Sort languages by code in Language::fetchLanguageNamesUncached
X-Git-Tag: 1.31.0-rc.0~12854^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=dc5db351a6531bd1da17ceea5f80d8583d5de819;p=lhc%2Fweb%2Fwiklou.git

Sort languages by code in Language::fetchLanguageNamesUncached

This is being used in API output in ApiQuerySiteinfo so having
it sorted is nicer.

Bug: T85406
Change-Id: I796112187d17337a1cc12d6752839263b53f40e1
---

diff --git a/languages/Language.php b/languages/Language.php
index 01fb986277..93c186c5ed 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -911,6 +911,7 @@ class Language {
 		}
 
 		if ( $include === 'all' ) {
+			ksort( $names );
 			return $names;
 		}
 
@@ -932,9 +933,11 @@ class Language {
 				}
 			}
 
+			ksort( $namesMwFile );
 			return $namesMwFile;
 		}
 
+		ksort( $returnMw );
 		# 'mw' option; default if it's not one of the other two options (all/mwfile)
 		return $returnMw;
 	}