Fix typo in r97044 reported in twn

[lhc/web/wiklou.git] / maintenance / namespaceDupes.php

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index d77d431..08783d7 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -26,6 +26,12 @@
 require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class NamespaceConflictChecker extends Maintenance {
+
+       /**
+        * @var DatabaseBase
+        */
+       protected $db;
+
        public function __construct() {
                parent::__construct();
                $this->mDescription = "";
@@ -66,8 +72,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 +84,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;
@@ -184,6 +189,8 @@ class NamespaceConflictChecker extends Maintenance {
         *
         * @param $ns Integer: namespace id (id for new namespace?)
         * @param $name String: prefix that is being made a namespace
+        *
+        * @return array
         */
        private function getConflicts( $ns, $name ) {
                $page  = 'page';
@@ -218,6 +225,8 @@ class NamespaceConflictChecker extends Maintenance {
 
        /**
         * Report any conflicts we find
+        *
+        * @return bool
         */
        private function reportConflict( $row, $suffix ) {
                $newTitle = Title::makeTitleSafe( $row->namespace, $row->title );