Moved constant values from initialiseFromUser() to class definition

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

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 8d44dd8..48a93dd 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -117,7 +117,6 @@ class MWNamespace {
                return isset( $nslist[$index] );
        }
 
-
        /**
         * Returns array of all defined namespaces with their canonical
         * (English) names.
@@ -131,8 +130,11 @@ class MWNamespace {
                        global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
                        if ( is_array( $wgExtraNamespaces ) ) {
                                $namespaces = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
+                       } else {
+                               $namespaces = $wgCanonicalNamespaceNames;
                        }
                        $namespaces[NS_MAIN] = '';
+                       wfRunHooks( 'CanonicalNamespaces', array( &$namespaces ) );
                }
                return $namespaces;
        }
@@ -184,7 +186,7 @@ class MWNamespace {
 
                if ( is_null( $mValidNamespaces ) ) {
                        foreach ( array_keys( self::getCanonicalNamespaces() ) as $ns ) {
-                               if ( $ns > 0 ) {
+                               if ( $ns >= 0 ) {
                                        $mValidNamespaces[] = $ns;
                                }
                        }