X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FNamespace.php;h=f8a1ab81f0de1d09ee3e5020473ea80f40c25173;hb=44d31b681fc83aecc819a78662a5d75a4a8655b7;hp=b77dbcb96d6a3644cd6fad48e3ef3e0b70bf7718;hpb=e980f2a801f7a01db66a952316fea6f9a6f742a6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Namespace.php b/includes/Namespace.php
index b77dbcb96d..f8a1ab81f0 100644
--- 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,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',
 );
 
@@ -56,10 +50,15 @@ class Namespace {
 	 * @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 );
 	}
 
 	/**
@@ -67,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
 	}
 
 	/**
@@ -100,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];
 	}
@@ -109,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 ) {
@@ -125,6 +118,4 @@ class Namespace {
 		}
 	}
 }
-
-}
 ?>