Revert revert of setSingleton(), unrelated to broken, accidentally committed code...

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 422a280..57a7128 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Provide things related to namespaces
- * @package MediaWiki
  */
 
 /**
@@ -11,7 +10,7 @@
 $wgCanonicalNamespaceNames = array(
        NS_MEDIA            => 'Media',
        NS_SPECIAL          => 'Special',
-       NS_TALK             => 'Talk',
+       NS_TALK             => 'Talk',
        NS_USER             => 'User',
        NS_USER_TALK        => 'User_talk',
        NS_PROJECT          => 'Project',
@@ -24,7 +23,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',
 );
 
@@ -41,59 +40,76 @@ if( is_array( $wgExtraNamespaces ) ) {
  * These are synonyms for the names given in the language file
  * Users and translators should not change them
  *
- * @package MediaWiki
  */
+
+/*
+WARNING: The statement below may fail on some versions of PHP: see bug 12294
+*/
+
 class Namespace {
 
        /**
-        * Check if the given namespace might be moved
+        * Can pages in the given namespace be moved?
+        *
+        * @param int $index Namespace index
         * @return bool
         */
-       function isMovable( $index ) {
+       public static function isMovable( $index ) {
                return !( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY );
        }
 
        /**
-        * Check if the given namespace is not a talk page
+        * Is the given namespace is a subject (non-talk) namespace?
+        *
+        * @param int $index Namespace index
         * @return bool
         */
-       function isMain( $index ) {
-               return ! Namespace::isTalk( $index );
+       public static function isMain( $index ) {
+               return !self::isTalk( $index );
        }
 
        /**
-        * Check if the give namespace is a talk page
+        * Is the given namespace a talk namespace?
+        *
+        * @param int $index Namespace index
         * @return bool
         */
-       static function isTalk( $index ) {
-               return ($index > NS_MAIN)  // Special namespaces are negative
-                       && ($index % 2); // Talk namespaces are odd-numbered
+       public static function isTalk( $index ) {
+               return $index > NS_MAIN
+                       && $index % 2;
        }
 
        /**
-        * Get the talk namespace corresponding to the given index
+        * Get the talk namespace index for a given namespace
+        *
+        * @param int $index Namespace index
+        * @return int
         */
-       function getTalk( $index ) {
-               if ( Namespace::isTalk( $index ) ) {
-                       return $index;
-               } else {
-                       # FIXME
-                       return $index + 1;
-               }
+       public static function getTalk( $index ) {
+               return self::isTalk( $index )
+                       ? $index
+                       : $index + 1;
        }
 
-       function getSubject( $index ) {
-               if ( Namespace::isTalk( $index ) ) {
-                       return $index - 1;
-               } else {
-                       return $index;
-               }
+       /**
+        * Get the subject namespace index for a given namespace
+        *
+        * @param int $index Namespace index
+        * @return int
+        */
+       public static function getSubject( $index ) {
+               return self::isTalk( $index )
+                       ? $index - 1
+                       : $index;
        }
 
        /**
         * Returns the canonical (English Wikipedia) name for a given index
+        *
+        * @param int $index Namespace index
+        * @return string
         */
-       function getCanonicalName( $index ) {
+       public static function getCanonicalName( $index ) {
                global $wgCanonicalNamespaceNames;
                return $wgCanonicalNamespaceNames[$index];
        }
@@ -101,8 +117,11 @@ class Namespace {
        /**
         * Returns the index for a given canonical name, or NULL
         * The input *must* be converted to lower case first
+        *
+        * @param string $name Namespace name
+        * @return int
         */
-       function getCanonicalIndex( $name ) {
+       public static function getCanonicalIndex( $name ) {
                global $wgCanonicalNamespaceNames;
                static $xNamespaces = false;
                if ( $xNamespaces === false ) {
@@ -120,10 +139,34 @@ class Namespace {
        
        /**
         * Can this namespace ever have a talk namespace?
+        *
         * @param $index Namespace index
+        * @return bool
         */
-        function canTalk( $index ) {
-               return( $index >= NS_MAIN );
+        public static function canTalk( $index ) {
+               return $index >= NS_MAIN;
         }
-}
-?>
+        
+       /**
+        * Does this namespace contain content, for the purposes
+        * of calculating statistics, etc?
+        *
+        * @param $index Index to check
+        * @return bool
+        */
+       public static function isContent( $index ) {
+               global $wgContentNamespaces;
+               return $index == NS_MAIN || in_array( $index, $wgContentNamespaces );
+       }
+       
+       /**
+        * Can pages in a namespace be watched?
+        *
+        * @param int $index
+        * @return bool
+        */
+       public static function isWatchable( $index ) {
+               return $index >= NS_MAIN;
+       }
+        
+}
\ No newline at end of file