new feature: $wgBlockAllowsUTEdit

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index a52e06d..a7345eb 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -30,11 +30,11 @@ $wgCanonicalNamespaceNames = array(
        NS_TEMPLATE_TALK    => 'Template_talk',
        NS_HELP             => 'Help',
        NS_HELP_TALK        => 'Help_talk',
-       NS_CATEGORY             => 'Category',
-       NS_CATEGORY_TALK    => 'Category_talk'
+       NS_CATEGORY         => 'Category',
+       NS_CATEGORY_TALK    => 'Category_talk',
 );
 
-if( defined( 'MEDIAWIKI' ) && is_array( $wgExtraNamespaces ) ) {
+if( is_array( $wgExtraNamespaces ) ) {
        $wgCanonicalNamespaceNames = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
 }
 
@@ -51,18 +51,6 @@ if( defined( 'MEDIAWIKI' ) && is_array( $wgExtraNamespaces ) ) {
  */
 class Namespace {
 
-       /**#@+
-        * These functions are deprecated
-        * @deprecated
-        */
-       function getSpecial() { return NS_SPECIAL; }
-       function getUser() { return NS_USER; }
-       function getWikipedia() { return NS_PROJECT; }
-       function getImage() { return NS_IMAGE; }
-       function getMedia() { return NS_MEDIA; }
-       function getCategory() { return NS_CATEGORY; }
-       /**#@-*/
-
        /**
         * Check if the given namespace might be moved
         * @return bool