http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90097
Revision: 90097
Author: krinkle
Date: 2011-06-14 22:51:47 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Merge conflict fix from r90096.
Modified Paths:
--------------
trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php
Modified: trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php
===================================================================
--- trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php
2011-06-14 22:49:38 UTC (rev 90096)
+++ trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php
2011-06-14 22:51:47 UTC (rev 90097)
@@ -60,7 +60,7 @@
// 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
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
