From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 10 Apr 2010 23:52:07 +0000 (+0000)
Subject: Fix for issue noted on CR r64876: fatal error on CSS/JS subpage display
X-Git-Tag: 1.31.0-rc.0~37151
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=7dc30f7aea6cd84a42a4e162d4b2409b02c67df6;p=lhc%2Fweb%2Fwiklou.git

Fix for issue noted on CR r64876: fatal error on CSS/JS subpage display
---

diff --git a/includes/Article.php b/includes/Article.php
index da17936faf..3211e6f9b4 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -848,6 +848,7 @@ class Article {
 		# Keep going until $outputDone is set, or we run out of things to do.
 		$pass = 0;
 		$outputDone = false;
+		$this->mParserOutput = false;
 		while ( !$outputDone && ++$pass ) {
 			switch( $pass ) {
 				case 1:
@@ -957,9 +958,11 @@ class Article {
 		}
 
 		# Adjust the title if it was set by displaytitle, -{T|}- or language conversion
-		$titleText = $this->mParserOutput->getTitleText();
-		if ( strval( $titleText ) !== '' ) {
-			$wgOut->setPageTitle( $titleText );
+		if ( $this->mParserOutput ) {
+			$titleText = $this->mParserOutput->getTitleText();
+			if ( strval( $titleText ) !== '' ) {
+				$wgOut->setPageTitle( $titleText );
+			}
 		}
 
 		# Now that we've filled $this->mParserOutput, we know whether