r64918 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r64917‎ | r64918 | r64919 >
Date:23:52, 10 April 2010
Author:tstarling
Status:ok
Tags:
Comment:
Fix for issue noted on CR r64876: fatal error on CSS/JS subpage display
Modified paths:
  • /trunk/phase3/includes/Article.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Article.php
@@ -848,6 +848,7 @@
849849 # Keep going until $outputDone is set, or we run out of things to do.
850850 $pass = 0;
851851 $outputDone = false;
 852+ $this->mParserOutput = false;
852853 while ( !$outputDone && ++$pass ) {
853854 switch( $pass ) {
854855 case 1:
@@ -957,9 +958,11 @@
958959 }
959960
960961 # Adjust the title if it was set by displaytitle, -{T|}- or language conversion
961 - $titleText = $this->mParserOutput->getTitleText();
962 - if ( strval( $titleText ) !== '' ) {
963 - $wgOut->setPageTitle( $titleText );
 962+ if ( $this->mParserOutput ) {
 963+ $titleText = $this->mParserOutput->getTitleText();
 964+ if ( strval( $titleText ) !== '' ) {
 965+ $wgOut->setPageTitle( $titleText );
 966+ }
964967 }
965968
966969 # Now that we've filled $this->mParserOutput, we know whether

Follow-up revisions

RevisionCommit summaryAuthorDate
r649291.16wmf4: Merge langconverter fixes from trunk: r64851, r64856, r64876, r6489...catrope12:01, 11 April 2010
r65393MFT r64876 and followups r64892, r64918, 64934: fix various language converte...tstarling14:51, 21 April 2010

Past revisions this follows-up on

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

Status & tagging log