(bug 28868) Include the number of pages in the default getLongDesc for multipaged...

[lhc/web/wiklou.git] / includes / Namespace.php

diff --git a/includes/Namespace.php b/includes/Namespace.php
index c0df368..34ab6bb 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -4,35 +4,6 @@
  * @file
  */
 
-/**
- * Definitions of the NS_ constants are in Defines.php
- * @private
- */
-$wgCanonicalNamespaceNames = array(
-       NS_MEDIA            => 'Media',
-       NS_SPECIAL          => 'Special',
-       NS_TALK             => 'Talk',
-       NS_USER             => 'User',
-       NS_USER_TALK        => 'User_talk',
-       NS_PROJECT          => 'Project',
-       NS_PROJECT_TALK     => 'Project_talk',
-       NS_FILE             => 'File',
-       NS_FILE_TALK        => 'File_talk',
-       NS_MEDIAWIKI        => 'MediaWiki',
-       NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
-       NS_TEMPLATE         => 'Template',
-       NS_TEMPLATE_TALK    => 'Template_talk',
-       NS_HELP             => 'Help',
-       NS_HELP_TALK        => 'Help_talk',
-       NS_CATEGORY         => 'Category',
-       NS_CATEGORY_TALK    => 'Category_talk',
-);
-
-/// @todo UGLY UGLY
-if( is_array( $wgExtraNamespaces ) ) {
-       $wgCanonicalNamespaceNames = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
-}
-
 /**
  * This is a utility class with only static functions
  * for dealing with namespaces that encodes all the
@@ -64,7 +35,6 @@ class MWNamespace {
        private static function isMethodValidFor( $index, $method ) {
                if( $index < NS_MAIN ) {
                        throw new MWException( "$method does not make any sense for given namespace $index" );
-                       return false;
                }
                return true;
        }