From 1ac0cbb7948d318dd6d74c81c0163f34bda2b661 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 14 Jan 2010 19:39:00 +0000
Subject: [PATCH] * (bug 21303) Comments are no longer stripped from
 MediaWiki:Common.js and skin-specific JS pages (those message no longer have
 their wikitext variables replaced) * Removed a trailing space in
 RELEASE-NOTES

---
 RELEASE-NOTES     | 4 +++-
 includes/Skin.php | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8606963d96..174b80b1a3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -704,11 +704,13 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 9794) User rights log entries for foreign user now links to the foreign
   user's page if possible
 * (bug 14717) Don't load nonexistent CSS fix files for non-Monobook skins
-* (bug 18765) Increased consistency of bold-italic markup for unbalanced quotes. 
+* (bug 18765) Increased consistency of bold-italic markup for unbalanced quotes.
   Improved representation of six quotes (may break existing markup).
 * (bug 22034) Use wfClientAcceptsGzip() in wfGzipHandler instead of
   reimplementing it.
 * (bug 19226) First line renders differently on many UI messages.
+* (bug 21303) Comments are no longer stripped from MediaWiki:Common.js and
+  skin-specific JS pages
 
 == API changes in 1.16 ==
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 4c5cca292a..ced9b16280 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -498,14 +498,14 @@ class Skin extends Linker {
 
 		wfProfileIn( __METHOD__ );
 		if( !$skinName ) {
-			$skinName =	$this->getSkinName();
+			$skinName = $this->getSkinName();
 		}
 
 		$s = "/* generated javascript */\n";
 		$s .= "var skin = '" . Xml::escapeJsString($skinName ) . "';\n";
 		$s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
 		$s .= "\n\n/* MediaWiki:Common.js */\n";
-		$commonJs = wfMsgForContent( 'common.js' );
+		$commonJs = wfMsgExt( 'common.js', 'content' );
 		if ( !wfEmptyMsg( 'common.js', $commonJs ) ) {
 			$s .= $commonJs;
 		}
@@ -514,7 +514,7 @@ class Skin extends Linker {
 		// avoid inclusion of non defined user JavaScript (with custom skins only)
 		// by checking for default message content
 		$msgKey = ucfirst( $skinName ) . '.js';
-		$userJS = wfMsgForContent( $msgKey );
+		$userJS = wfMsgExt( $msgKey, 'content' );
 		if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
 			$s .= $userJS;
 		}
-- 
2.20.1