From 1048b0bcb2861feae1c4f3e7bcb6cf4691b67553 Mon Sep 17 00:00:00 2001
From: daniel <daniel.kinzler@wikimedia.de>
Date: Tue, 9 Oct 2012 14:23:42 +0200
Subject: [PATCH] Fix merge artifact in Article::showCssOrJsPage.

Change-Id: I1e9608809b81d2c5feeb048ddee96d5324b62a81
---
 includes/Article.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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() );
 		}
 	}
 
-- 
2.20.1