Fix for issue noted on CR r64876: fatal error on CSS/JS subpage display

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index f9c2311..e8e7523 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -28,7 +28,7 @@ $wgCanonicalNamespaceNames = array(
        NS_CATEGORY_TALK    => 'Category_talk',
 );
 
-if( is_array( $wgExtraNamespaces ) ) {
+if( isset( $wgExtraNamespaces ) && is_array( $wgExtraNamespaces ) ) {
        $wgCanonicalNamespaceNames = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
 }
 
@@ -46,11 +46,11 @@ if( is_array( $wgExtraNamespaces ) ) {
 class MWNamespace {
 
        /**
-        * These namespaces should always be first-letter capitalized, now and 
-        * forevermore. Historically, they could've probably been lowercased too, 
+        * These namespaces should always be first-letter capitalized, now and
+        * forevermore. Historically, they could've probably been lowercased too,
         * but some things are just too ingrained now. :)
         */
-       private static $alwaysCapitalizedNamespaces = array( NS_SPECIAL, NS_MEDIAWIKI );
+       private static $alwaysCapitalizedNamespaces = array( NS_SPECIAL, NS_USER, NS_MEDIAWIKI );
 
        /**
         * Can pages in the given namespace be moved?
@@ -108,6 +108,15 @@ class MWNamespace {
                        : $index;
        }
 
+       /**
+        * Returns whether the specified namespace exists
+        */
+       public static function exists( $index ) {
+               global $wgCanonicalNamespaceNames;
+               return isset( $wgCanonicalNamespaceNames[$index] );
+       }
+
+
        /**
         * Returns the canonical (English Wikipedia) name for a given index
         *
@@ -142,7 +151,7 @@ class MWNamespace {
                if ( array_key_exists( $name, $xNamespaces ) ) {
                        return $xNamespaces[$name];
                } else {
-                       return NULL;
+                       return null;
                }
        }
 
@@ -153,7 +162,7 @@ class MWNamespace {
         * @return bool
         */
         public static function canTalk( $index ) {
-               return $index >= NS_MAIN;
+               return $index >= NS_MAIN;
         }
 
        /**
@@ -188,10 +197,10 @@ class MWNamespace {
                global $wgNamespacesWithSubpages;
                return !empty( $wgNamespacesWithSubpages[$index] );
        }
-       
+
        /**
         * Is the namespace first-letter capitalized?
-        * 
+        *
         * @param $index int Index to check
         * @return bool
         */
@@ -199,10 +208,10 @@ class MWNamespace {
                global $wgCapitalLinks, $wgCapitalLinkOverrides;
                // Turn NS_MEDIA into NS_FILE
                $index = $index === NS_MEDIA ? NS_FILE : $index;
-               
+
                // Make sure to get the subject of our namespace
                $index = self::getSubject( $index );
-               
+
                // Some namespaces are special and should always be upper case
                if ( in_array( $index, self::$alwaysCapitalizedNamespaces ) ) {
                        return true;