When reading from meta's interwiki map, *.wikimedia.org should be set as local (e...

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 69ee063..f8a1ab8 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -3,16 +3,10 @@
  * Provide things related to namespaces
  * @package MediaWiki
  */
- 
-/**
- * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
 
- 
 /**
  * Definitions of the NS_ constants are in Defines.php
- * @private
+ * @access private
  */
 $wgCanonicalNamespaceNames = array(
        NS_MEDIA            => 'Media',
@@ -30,14 +24,11 @@ $wgCanonicalNamespaceNames = array(
        NS_TEMPLATE_TALK    => 'Template_talk',
        NS_HELP             => 'Help',
        NS_HELP_TALK        => 'Help_talk',
-       NS_CATEGORY             => 'Category',
-       NS_CATEGORY_TALK    => 'Category_talk'
-    
-       NS_THREAD               => 'Thread',        // Reserved for Forum-like
-       NS_THREAD_TALK      => 'Thread_talk'    // Reserved for Forum-like
+       NS_CATEGORY         => 'Category',
+       NS_CATEGORY_TALK    => 'Category_talk',
 );
 
-if( defined( 'MEDIAWIKI' ) && is_array( $wgExtraNamespaces ) ) {
+if( is_array( $wgExtraNamespaces ) ) {
        $wgCanonicalNamespaceNames = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
 }
 
@@ -54,27 +45,20 @@ if( defined( 'MEDIAWIKI' ) && is_array( $wgExtraNamespaces ) ) {
  */
 class Namespace {
 
-       /**#@+
-        * These functions are deprecated
-        * @deprecated
-        */
-       function getSpecial() { return NS_SPECIAL; }
-       function getUser() { return NS_USER; }
-       function getWikipedia() { return NS_PROJECT; }
-       function getImage() { return NS_IMAGE; }
-       function getMedia() { return NS_MEDIA; }
-       function getCategory() { return NS_CATEGORY; }
-       /**#@-*/
-
        /**
         * Check if the given namespace might be moved
         * @return bool
         */
        function isMovable( $index ) {
-               if ( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY ) { 
-                       return false; 
-               }
-               return true;
+               return !( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY );
+       }
+
+       /**
+        * Check if the given namespace is not a talk page
+        * @return bool
+        */
+       function isMain( $index ) {
+               return ! Namespace::isTalk( $index );
        }
 
        /**
@@ -82,14 +66,8 @@ class Namespace {
         * @return bool
         */
        function isTalk( $index ) {
-               global $wgExtraNamespaces;
-               return ( $index == NS_TALK           || $index == NS_USER_TALK     ||
-                                $index == NS_PROJECT_TALK   || $index == NS_IMAGE_TALK    ||
-                                $index == NS_MEDIAWIKI_TALK || $index == NS_TEMPLATE_TALK ||
-                                $index == NS_HELP_TALK      || $index == NS_CATEGORY_TALK 
-                                ||  ( (isset($wgExtraNamespaces) && $index % 2) )
-                                );
-               
+               return ($index > NS_MAIN)  // Special namespaces are negative
+                       && ($index % 2); // Talk namespaces are odd-numbered
        }
 
        /**
@@ -115,7 +93,7 @@ class Namespace {
        /**
         * Returns the canonical (English Wikipedia) name for a given index
         */
-       function &getCanonicalName( $index ) {
+       function getCanonicalName( $index ) {
                global $wgCanonicalNamespaceNames;
                return $wgCanonicalNamespaceNames[$index];
        }
@@ -124,7 +102,7 @@ class Namespace {
         * Returns the index for a given canonical name, or NULL
         * The input *must* be converted to lower case first
         */
-       function &getCanonicalIndex( $name ) {
+       function getCanonicalIndex( $name ) {
                global $wgCanonicalNamespaceNames;
                static $xNamespaces = false;
                if ( $xNamespaces === false ) {
@@ -140,6 +118,4 @@ class Namespace {
                }
        }
 }
-
-}
 ?>