r90097 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r90096‎ | r90097 | r90098 >
Date:22:51, 14 June 2011
Author:krinkle
Status:ok
Tags:
Comment:
Merge conflict fix from r90096.
Modified paths:
  • /trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -60,7 +60,7 @@
6161 // to their numerical ids (case insensitive and with underscores)
6262 $namespaceIds = $wgContLang->getNamespaceIds();
6363 foreach( MWNamespace::getCanonicalNamespaces() as $index => $name ) {
64 - $nsIds[$wgContLang->lc( $name )] = $index;
 64+ $namespaceIds[$wgContLang->lc( $name )] = $index;
6565 }
6666
6767 // Build list of variables

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r90096wgNamespaceIds in JavaScript didn't include canonical namespaces. Adding them...krinkle22:49, 14 June 2011

Status & tagging log