r79923 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79922‎ | r79923 | r79924 >
Date:02:43, 10 January 2011
Author:philip
Status:ok
Tags:
Comment:
Bug 26642, follow up r70187: Fix the 1.16 namespace conversion bug which caused by a missing
argument $wfMsgOut for wfEmptyMsg(). This argument has been removed in trunk and 1.17.
Modified paths:
  • /branches/REL1_16/phase3/languages/LanguageConverter.php (modified) (history)

Diff [purge]

Index: branches/REL1_16/phase3/languages/LanguageConverter.php
@@ -551,13 +551,14 @@
552552 public function convertTitle( $title ) {
553553 $variant = $this->getPreferredVariant();
554554 $index = $title->getNamespace();
555 - if ( $index === NS_MAIN ) {
 555+ if ( $index === NS_MAIN || $index === NS_SPECIAL ) {
556556 $text = '';
557557 } else {
558558 // first let's check if a message has given us a converted name
559559 $nsConvKey = 'conversion-ns' . $index;
560 - if ( !wfEmptyMsg( $nsConvKey ) ) {
561 - $text = wfMsgForContentNoTrans( $nsConvKey );
 560+ $nsLocalText = wfMsgForContentNoTrans( $nsConvKey );
 561+ if ( !wfEmptyMsg( $nsConvKey, $nsLocalText ) ) {
 562+ $text = $nsLocalText;
562563 } else {
563564 // the message does not exist, try retrieve it from the current
564565 // variant's namespace names.

Follow-up revisions

RevisionCommit summaryAuthorDate
r81277* Release notes for r79923, r80227...tstarling22:34, 31 January 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r70187Merge r69080, r69081, r69085, r69086 from trunk: bug fixes of Language Conver...philip01:49, 30 July 2010

Status & tagging log