| Index: trunk/phase3/includes/Namespace.php |
| — | — | @@ -128,12 +128,10 @@ |
| 129 | 129 | static $namespaces = null; |
| 130 | 130 | if ( $namespaces === null ) { |
| 131 | 131 | global $wgExtraNamespaces, $wgCanonicalNamespaceNames; |
| | 132 | + $namespaces = array( NS_MAIN => '' ) + $wgCanonicalNamespaceNames; |
| 132 | 133 | if ( is_array( $wgExtraNamespaces ) ) { |
| 133 | | - $namespaces = $wgCanonicalNamespaceNames + $wgExtraNamespaces; |
| 134 | | - } else { |
| 135 | | - $namespaces = $wgCanonicalNamespaceNames; |
| | 134 | + $namespaces += $wgExtraNamespaces; |
| 136 | 135 | } |
| 137 | | - $namespaces[NS_MAIN] = ''; |
| 138 | 136 | wfRunHooks( 'CanonicalNamespaces', array( &$namespaces ) ); |
| 139 | 137 | } |
| 140 | 138 | return $namespaces; |