From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 26 Jul 2006 20:37:11 +0000 (+0000)
Subject: * Fix regression in ordering of namespaces
X-Git-Tag: 1.31.0-rc.0~56135
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=80249cf6cb16520ade6379474a3d7802f5b56c26;p=lhc%2Fweb%2Fwiklou.git

* Fix regression in ordering of namespaces
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ee165cb76c..0ef064da05 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -100,6 +100,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   profiler during maintenance scripts.
 * Added "serialized" directory, for storing precompiled data in serialized form.
 * Fix regression in auto-set NS_PROJECT_TALK namespace
+* Fix regression in ordering of namespaces
 
 
 == Languages updated ==
diff --git a/languages/Language.php b/languages/Language.php
index 34cc94ae78..990fed5e28 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1473,6 +1473,10 @@ class Language {
 			}
 			$this->namespaceNames[NS_PROJECT_TALK] = $talk;
 		}
+		
+		# The above mixing may leave namespaces out of canonical order.
+		# Re-order by namespace ID number...
+		ksort( $this->namespaceNames );
 
 		# Put namespace names and aliases into a hashtable.
 		# If this is too slow, then we should arrange it so that it is done