From ba0d5719dd17cdaec65a153636e27906ad5c6423 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 8 Apr 2011 07:14:42 +0000
Subject: [PATCH] Use MWNamespace::getCanonicalNamespaces() instead of
 $wgCanonicalNamespaceNames

---
 maintenance/namespaceDupes.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index d77d431487..b883ea6857 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -66,8 +66,7 @@ class NamespaceConflictChecker extends Maintenance {
 	 * @param $suffix String: suffix to append to renamed articles
 	 */
 	private function checkAll( $fix, $suffix = '' ) {
-		global $wgContLang, $wgNamespaceAliases, $wgCanonicalNamespaceNames;
-		global $wgCapitalLinks;
+		global $wgContLang, $wgNamespaceAliases, $wgCapitalLinks;
 
 		$spaces = array();
 
@@ -79,7 +78,7 @@ class NamespaceConflictChecker extends Maintenance {
 		}
 
 		// Now pull in all canonical and alias namespaces...
-		foreach ( $wgCanonicalNamespaceNames as $ns => $name ) {
+		foreach ( MWNamespace::getCanonicalNamespaces() as $ns => $name ) {
 			// This includes $wgExtraNamespaces
 			if ( $name !== '' ) {
 				$spaces[$name] = $ns;
-- 
2.20.1