* Follow-up r84610: don't assume a Parser object is attached

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 2e4b789..95c58cc 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -53,6 +53,21 @@ class MWNamespace {
         */
        private static $alwaysCapitalizedNamespaces = array( NS_SPECIAL, NS_USER, NS_MEDIAWIKI );
 
+       /**
+        * Throw an exception when trying to get the subject or talk page
+        * for a given namespace where it does not make sense.
+        * Special namespaces are defined in includes/define.php and have
+        * a value below 0 (ex: NS_SPECIAL = -1 , NS_MEDIA = -2)
+        *
+        * @param $ns Int: namespace index
+        */
+       private static function isMethodValidFor( $index, $method ) {
+               if( $index < NS_MAIN ) {
+                       throw new MWException( "$method does not make any sense for given namespace $index" );
+               }
+               return true;
+       }
+
        /**
         * Can pages in the given namespace be moved?
         *
@@ -92,6 +107,7 @@ class MWNamespace {
         * @return int
         */
        public static function getTalk( $index ) {
+               self::isMethodValidFor( $index, __METHOD__ );
                return self::isTalk( $index )
                        ? $index
                        : $index + 1;
@@ -99,16 +115,42 @@ class MWNamespace {
 
        /**
         * Get the subject namespace index for a given namespace
+        * Special namespaces (NS_MEDIA, NS_SPECIAL) are always the subject.
         *
         * @param $index Int: Namespace index
         * @return int
         */
        public static function getSubject( $index ) {
+               # Handle special namespaces
+               if( $index < NS_MAIN ) {
+                       return $index;
+               }
+
                return self::isTalk( $index )
                        ? $index - 1
                        : $index;
        }
 
+       /**
+        * Get the associated namespace.
+        * For talk namespaces, returns the subject (non-talk) namespace
+        * For subject (non-talk) namespaces, returns the talk namespace
+        *
+        * @param $index Int: namespace index
+        * @return int or null if no associated namespace could be found
+        */
+       public static function getAssociated( $index ) {
+               self::isMethodValidFor( $index, __METHOD__ );
+
+               if( self::isMain( $index ) ) {
+                       return self::getTalk( $index );
+               } elseif( self::isTalk( $index ) ) {
+                       return self::getSubject( $index );
+               } else {
+                       return null;
+               }
+       }
+
        /**
         * Returns whether the specified namespace exists
         */