Fixed some errors while running patchSql.php:

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 8dd52b9..e8e7523 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -16,8 +16,8 @@ $wgCanonicalNamespaceNames = array(
        NS_USER_TALK        => 'User_talk',
        NS_PROJECT          => 'Project',
        NS_PROJECT_TALK     => 'Project_talk',
-       NS_IMAGE            => 'Image',
-       NS_IMAGE_TALK       => 'Image_talk',
+       NS_FILE             => 'File',
+       NS_FILE_TALK        => 'File_talk',
        NS_MEDIAWIKI        => 'MediaWiki',
        NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
        NS_TEMPLATE         => 'Template',
@@ -28,7 +28,7 @@ $wgCanonicalNamespaceNames = array(
        NS_CATEGORY_TALK    => 'Category_talk',
 );
 
-if( is_array( $wgExtraNamespaces ) ) {
+if( isset( $wgExtraNamespaces ) && is_array( $wgExtraNamespaces ) ) {
        $wgCanonicalNamespaceNames = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
 }
 
@@ -45,6 +45,13 @@ 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,
+        * but some things are just too ingrained now. :)
+        */
+       private static $alwaysCapitalizedNamespaces = array( NS_SPECIAL, NS_USER, NS_MEDIAWIKI );
+
        /**
         * Can pages in the given namespace be moved?
         *
@@ -52,7 +59,8 @@ class MWNamespace {
         * @return bool
         */
        public static function isMovable( $index ) {
-               return !( $index < NS_MAIN || $index == NS_CATEGORY );
+               global $wgAllowImageMoving;
+               return !( $index < NS_MAIN || ($index == NS_FILE && !$wgAllowImageMoving)  || $index == NS_CATEGORY );
        }
 
        /**
@@ -100,15 +108,28 @@ 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
         *
         * @param $index Int: namespace index
-        * @return string
+        * @return string or false if no canonical definition.
         */
        public static function getCanonicalName( $index ) {
                global $wgCanonicalNamespaceNames;
-               return $wgCanonicalNamespaceNames[$index];
+               if( isset( $wgCanonicalNamespaceNames[$index] ) ) {
+                       return $wgCanonicalNamespaceNames[$index];
+               } else {
+                       return false;
+               }
        }
 
        /**
@@ -130,7 +151,7 @@ class MWNamespace {
                if ( array_key_exists( $name, $xNamespaces ) ) {
                        return $xNamespaces[$name];
                } else {
-                       return NULL;
+                       return null;
                }
        }
 
@@ -141,7 +162,7 @@ class MWNamespace {
         * @return bool
         */
         public static function canTalk( $index ) {
-               return $index >= NS_MAIN;
+               return $index >= NS_MAIN;
         }
 
        /**
@@ -177,4 +198,29 @@ class MWNamespace {
                return !empty( $wgNamespacesWithSubpages[$index] );
        }
 
+       /**
+        * Is the namespace first-letter capitalized?
+        *
+        * @param $index int Index to check
+        * @return bool
+        */
+       public static function isCapitalized( $index ) {
+               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;
+               }
+               if ( isset( $wgCapitalLinkOverrides[ $index ] ) ) {
+                       // $wgCapitalLinkOverrides is explicitly set
+                       return $wgCapitalLinkOverrides[ $index ];
+               }
+               // Default to the global setting
+               return $wgCapitalLinks;
+       }
 }