r71388 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r71387‎ | r71388 | r71389 >
Date:08:05, 21 August 2010
Author:nikerabbit
Status:ok (Comments)
Tags:
Comment:
Fix translated core namespaces broken in r71342.

The parser tests don't fail anymore (after I was able to run them in the first place)
Modified paths:
  • /trunk/phase3/languages/Language.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/Language.php
——@@ -245,12 +245,12 @@
246246 */
247247 function getNamespaces() {
248248 if ( is_null( $this->namespaceNames ) ) {
249 - global $wgMetaNamespace, $wgMetaNamespaceTalk;
 249+ global $wgMetaNamespace, $wgMetaNamespaceTalk, $wgExtraNamespaces;
250250
251251 $this->namespaceNames = self::$dataCache->getItem( $this->mCode, 'namespaceNames' );
252252 $validNamespaces = MWNamespace::getCanonicalNamespaces();
253253
254 - $this->namespaceNames = $validNamespaces + $this->namespaceNames;
 254+ $this->namespaceNames = $wgExtraNamespaces + $this->namespaceNames + $validNamespaces;
255255
256256 $this->namespaceNames[NS_PROJECT] = $wgMetaNamespace;
257257 if ( $wgMetaNamespaceTalk ) {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r71342Trying to clean up the mess with $wgCanonicalNamespaceNames and $wgExtraNames...nikerabbit10:25, 20 August 2010

Comments

#Comment by OverlordQ (talk | contribs)   08:15, 21 August 2010

Deleting old default messages (this may take a long time!)...PHP Fatal error: Unsupported operand types in /var/www/com/w/languages/Language.php on line 253

Fatal error: Unsupported operand types in /var/www/com/w/languages/Language.php on line 253

#Comment by Nikerabbit (talk | contribs)   08:21, 21 August 2010

r71391

Status & tagging log