From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 3 Jun 2008 19:33:24 +0000 (+0000)
Subject: Remove bullshit "deprecated" warnings about MediaWiki:Monobook.js
X-Git-Tag: 1.31.0-rc.0~47204
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=d9522ee06058b34afd8de0083bc9186d1a78c552;p=lhc%2Fweb%2Fwiklou.git

Remove bullshit "deprecated" warnings about MediaWiki:Monobook.js
Skin-specific JS pages are *PERFECTLY APPROPRIATE* for *SKIN-SPECIFIC* JS.
MediaWiki:Common.js should be used for *GENERAL JS*.
---

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 562defdc00..fa1ed86dfa 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1082,7 +1082,7 @@ class SkinTemplate extends Skin {
 		wfProfileIn( __METHOD__ );
 
 		$s = parent::getUserJs();
-		$s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js (deprecated; migrate to Common.js!) */\n";
+		$s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js */\n";
 
 		// avoid inclusion of non defined user JavaScript (with custom skins only)
 		// by checking for default message content
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9270158bba..7160cacbe2 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2659,7 +2659,7 @@ All transwiki import actions are logged at the [[Special:Log/import|import log]]
 
 # Scripts
 'common.js'   => '/* Any JavaScript here will be loaded for all users on every page load. */', # only translate this message to other languages if you have to change it
-'monobook.js' => '/* Deprecated; use [[MediaWiki:common.js]] */', # only translate this message to other languages if you have to change it
+'monobook.js' => '/* JavaScript here will be loaded for users using the MonoBook skin only. */', # only translate this message to other languages if you have to change it
 
 # Metadata
 'nodublincore'      => 'Dublin Core RDF metadata disabled for this server.',