From: Siebrand <siebrand@wikimedia.org>
Date: Tue, 9 Oct 2012 13:11:25 +0000 (+0000)
Subject: Merge "Report legacy hook handlers."
X-Git-Tag: 1.31.0-rc.0~22091
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=6eca634629cddd4961c39e6ee321082e183729c5;hp=25304cd1e1c47ac3122e9a5a764a7ad98c565c89;p=lhc%2Fweb%2Fwiklou.git

Merge "Report legacy hook handlers."
---

diff --git a/includes/Article.php b/includes/Article.php
index ee963384e1..736781225a 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -832,19 +832,20 @@ class Article extends Page {
 	 * @param bool $showCacheHint whether to show a message telling the user to clear the browser cache (default: true).
 	 */
 	protected function showCssOrJsPage( $showCacheHint = true ) {
+		$outputPage = $this->getContext()->getOutput();
+
 		if ( $showCacheHint ) {
 			$dir = $this->getContext()->getLanguage()->getDir();
 			$lang = $this->getContext()->getLanguage()->getCode();
 
-			$outputPage = $this->getContext()->getOutput();
 			$outputPage->wrapWikiMsg( "<div id='mw-clearyourcache' lang='$lang' dir='$dir' class='mw-content-$dir'>\n$1\n</div>",
 				'clearyourcache' );
 		}
 
 		// Give hooks a chance to customise the output
-		if ( ContentHandler::runLegacyHooks( 'ShowRawCssJs', array( $this->fetchContentObject(), $this->getTitle(), $wgOut ) ) ) {
+		if ( ContentHandler::runLegacyHooks( 'ShowRawCssJs', array( $this->fetchContentObject(), $this->getTitle(), $outputPage ) ) ) {
 			$po = $this->mContentObject->getParserOutput( $this->getTitle() );
-			$wgOut->addHTML( $po->getText() );
+			$outputPage->addHTML( $po->getText() );
 		}
 	}