Merge conflict fix from r90096.

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 83c57f9..206affd 100644 (file)
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -60,7 +60,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
                // to their numerical ids (case insensitive and with underscores)
                $namespaceIds = $wgContLang->getNamespaceIds();
                foreach( MWNamespace::getCanonicalNamespaces() as $index => $name ) {
-                       $nsIds[$wgContLang->lc( $name )] = $index;
+                       $namespaceIds[$wgContLang->lc( $name )] = $index;
                }
 
                // Build list of variables