* (bug 1850) Additional fixes so existing local and remote images

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index a7345eb..f1341cc 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -3,13 +3,13 @@
  * 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
@@ -56,25 +56,27 @@ class Namespace {
         * @return bool
         */
        function isMovable( $index ) {
-               if ( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY ) { 
-                       return false; 
+               if ( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY ) {
+                       return false;
                }
                return true;
        }
 
+       /**
+        * Check if the given namespace is not a talk page
+        * @return bool
+        */
+       function isMain( $index ) {
+               return ! Namespace::isTalk( $index );
+       }
+
        /**
         * Check if the give namespace is a talk page
         * @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 > 0)  // Special namespaces are negative
+                       && ($index % 2); // Talk namespaces are odd-numbered
        }
 
        /**
@@ -100,7 +102,7 @@ class Namespace {
        /**
         * Returns the canonical (English Wikipedia) name for a given index
         */
-       function &getCanonicalName( $index ) {
+       function getCanonicalName( $index ) {
                global $wgCanonicalNamespaceNames;
                return $wgCanonicalNamespaceNames[$index];
        }
@@ -109,7 +111,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 ) {