X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMWNamespace.php;h=0dd709f1e443edc043e215c75b851b52634d08fb;hb=20b7696494572b6ce8b7bd70d63cdc186484d5af;hp=731b62e0362656f9d7fd18b462c0bcf1fe8f9380;hpb=84764b82582116868a0124d7ce5ec1cf1adaabaa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MWNamespace.php b/includes/MWNamespace.php
index 731b62e036..0dd709f1e4 100644
--- a/includes/MWNamespace.php
+++ b/includes/MWNamespace.php
@@ -210,6 +210,8 @@ class MWNamespace {
 		if ( $namespaces === null || $rebuild ) {
 			global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
 			$namespaces = array( NS_MAIN => '' ) + $wgCanonicalNamespaceNames;
+			// Add extension namespaces
+			$namespaces += ExtensionRegistry::getInstance()->getAttribute( 'ExtensionNamespaces' );
 			if ( is_array( $wgExtraNamespaces ) ) {
 				$namespaces += $wgExtraNamespaces;
 			}
@@ -269,6 +271,8 @@ class MWNamespace {
 					$mValidNamespaces[] = $ns;
 				}
 			}
+			// T109137: sort numerically
+			sort( $mValidNamespaces, SORT_NUMERIC );
 		}
 
 		return $mValidNamespaces;