r64934 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r64933‎ | r64934 | r64935 >
Date:13:04, 11 April 2010
Author:philip
Status:ok
Tags:
Comment:
Follow up r64876. Try to fix pagetitle-view-mainpage.
Modified paths:
  • /trunk/phase3/includes/Article.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Article.php
@@ -832,15 +832,6 @@
833833 wfIncrStats( 'pcache_miss_stub' );
834834 }
835835
836 - # For the main page, overwrite the <title> element with the con-
837 - # tents of 'pagetitle-view-mainpage' instead of the default (if
838 - # that's not empty).
839 - if ( $this->mTitle->equals( Title::newMainPage() )
840 - && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' )
841 - {
842 - $wgOut->setHTMLTitle( $m );
843 - }
844 -
845836 $wasRedirected = $this->showRedirectedFromHeader();
846837 $this->showNamespaceHeader();
847838
@@ -965,6 +956,15 @@
966957 }
967958 }
968959
 960+ # For the main page, overwrite the <title> element with the con-
 961+ # tents of 'pagetitle-view-mainpage' instead of the default (if
 962+ # that's not empty).
 963+ if ( $this->mTitle->equals( Title::newMainPage() )
 964+ && ( $m = wfMsgForContent( 'pagetitle-view-mainpage' ) ) !== '' )
 965+ {
 966+ $wgOut->setHTMLTitle( $m );
 967+ }
 968+
969969 # Now that we've filled $this->mParserOutput, we know whether
970970 # there are any __NOINDEX__ tags on the page
971971 $policy = $this->getRobotPolicy( 'view' );

Follow-up revisions

RevisionCommit summaryAuthorDate
r65394MFT r64934: fix total breakage of pagetitle-view-mainpage on language convert...tstarling14:54, 21 April 2010
r71485Use the common code at switch end if viewing the current version of a page us...platonides14:13, 23 August 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r64876Proposed cleanup of recent LanguageConverter-related commits:...tstarling13:38, 10 April 2010

Status & tagging log