don't use OR on empty variables

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 37e580b..e3fdab5 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -25,6 +25,8 @@ define("NS_TEMPLATE", 10);
 define("NS_TEMPLATE_TALK", 11);
 define("NS_HELP", 12);
 define("NS_HELP_TALK", 13);
+define("NS_CATEGORY", 14);
+define("NS_CATEGORY_TALK", 15);
 
 # These are synonyms for the names given in the language file
 # Users and translators should not change them
@@ -34,8 +36,8 @@ define("NS_HELP_TALK", 13);
        NS_TALK             => "Talk",
        NS_USER             => "User",
        NS_USER_TALK        => "User_talk",
-       NS_WIKIPEDIA        => "MetaNamespace",
-       NS_WIKIPEDIA_TALK   => "MetaNamespace_talk",
+       NS_WIKIPEDIA        => "Project",
+       NS_WIKIPEDIA_TALK   => "Project_talk",
        NS_IMAGE            => "Image",
        NS_IMAGE_TALK       => "Image_talk",
        NS_MEDIAWIKI        => "MediaWiki",
@@ -43,7 +45,9 @@ define("NS_HELP_TALK", 13);
        NS_TEMPLATE         => "Template",
        NS_TEMPLATE_TALK    => "Template_talk",
        NS_HELP             => "Help",
-       NS_HELP_TALK        => "Help_talk"
+       NS_HELP_TALK        => "Help_talk",
+       NS_CATEGORY         => "Category",
+       NS_CATEGORY_TALK    => "Category_talk"
 );
 
 class Namespace {
@@ -54,10 +58,11 @@ class Namespace {
        function getWikipedia() { return NS_WP; }
        function getImage() { return NS_IMAGE; }
        function getMedia() { return NS_MEDIA; }
+       function getCategory() { return NS_CATEGORY; }
 
        function isMovable( $index )
        {
-               if ( $index < NS_MAIN || $index == NS_IMAGE ) { 
+               if ( $index < NS_MAIN || $index == NS_IMAGE  || $index == NS_CATEGORY ) { 
                        return false; 
                }
                return true;
@@ -65,7 +70,10 @@ class Namespace {
 
        function isTalk( $index )
        {
-               if ( NS_TALK == $index || NS_USER_TALK == $index || NS_WP_TALK == $index || NS_IMAGE_TALK == $index || NS_MEDIAWIKI_TALK == $index || NS_TEMPLATE_TALK == $index || NS_HELP_TALK == $index ) {
+               if ( NS_TALK == $index || NS_USER_TALK == $index || NS_WP_TALK
+       == $index || NS_IMAGE_TALK == $index || NS_MEDIAWIKI_TALK == $index ||
+       NS_TEMPLATE_TALK == $index || NS_HELP_TALK == $index ||
+       NS_CATEGORY_TALK == $index ) {
                        return true;
                }
                return false;