Reverting r16861; incompatible change to message texts, breaks a lot of toggle displa...

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index e366c0a..73dc296 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -1,6 +1,4 @@
 <?php
-if ( ! defined( 'MEDIAWIKI' ) )
-       die();
 /**
  * Provide things related to namespaces
  * @package MediaWiki
@@ -26,7 +24,7 @@ $wgCanonicalNamespaceNames = array(
        NS_TEMPLATE_TALK    => 'Template_talk',
        NS_HELP             => 'Help',
        NS_HELP_TALK        => 'Help_talk',
-       NS_CATEGORY         => 'Category',
+       NS_CATEGORY             => 'Category',
        NS_CATEGORY_TALK    => 'Category_talk',
 );
 
@@ -51,7 +49,7 @@ class Namespace {
         * Check if the given namespace might be moved
         * @return bool
         */
-       function isMovable( $index ) {
+       static function isMovable( $index ) {
                return !( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY );
        }
 
@@ -59,7 +57,7 @@ class Namespace {
         * Check if the given namespace is not a talk page
         * @return bool
         */
-       function isMain( $index ) {
+       static function isMain( $index ) {
                return ! Namespace::isTalk( $index );
        }
 
@@ -67,7 +65,7 @@ class Namespace {
         * Check if the give namespace is a talk page
         * @return bool
         */
-       function isTalk( $index ) {
+       static function isTalk( $index ) {
                return ($index > NS_MAIN)  // Special namespaces are negative
                        && ($index % 2); // Talk namespaces are odd-numbered
        }
@@ -75,7 +73,7 @@ class Namespace {
        /**
         * Get the talk namespace corresponding to the given index
         */
-       function getTalk( $index ) {
+       static function getTalk( $index ) {
                if ( Namespace::isTalk( $index ) ) {
                        return $index;
                } else {
@@ -84,7 +82,7 @@ class Namespace {
                }
        }
 
-       function getSubject( $index ) {
+       static function getSubject( $index ) {
                if ( Namespace::isTalk( $index ) ) {
                        return $index - 1;
                } else {
@@ -95,7 +93,7 @@ class Namespace {
        /**
         * Returns the canonical (English Wikipedia) name for a given index
         */
-       function getCanonicalName( $index ) {
+       static function getCanonicalName( $index ) {
                global $wgCanonicalNamespaceNames;
                return $wgCanonicalNamespaceNames[$index];
        }
@@ -104,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 ) {
+       static function getCanonicalIndex( $name ) {
                global $wgCanonicalNamespaceNames;
                static $xNamespaces = false;
                if ( $xNamespaces === false ) {
@@ -119,5 +117,13 @@ class Namespace {
                        return NULL;
                }
        }
+       
+       /**
+        * Can this namespace ever have a talk namespace?
+        * @param $index Namespace index
+        */
+        static function canTalk( $index ) {
+               return( $index >= NS_MAIN );
+        }
 }
 ?>