* Fix regression in ordering of namespaces

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ee165cb..0ef064d 100644 (file)
--- 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 34cc94a..990fed5 100644 (file)
--- 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