From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Wed, 15 Feb 2012 19:44:54 +0000 (+0000)
Subject: Add &useskin=default handling to always display the wiki's default skin.
X-Git-Tag: 1.31.0-rc.0~24696
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=522d92761a129c0d94fc61522d55c40ea02b866d;p=lhc%2Fweb%2Fwiklou.git

Add &useskin=default handling to always display the wiki's default skin.
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index d33d508b39..106837601d 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -15,6 +15,8 @@ production.
 === New features in 1.20 ===
 * Added TitleIsAlwaysKnown hook which gets called when determining if a page exists.
 * (bug 32341) Add upload by URL domain limitation.
+* &useskin=default will now always display the default skin. Useful for users with a
+  preference for the non-default skin to look at something using the default skin.
 
 === Bug fixes in 1.20 ===
 * (bug 30245) Use the correct way to construct a log page title.
diff --git a/includes/Skin.php b/includes/Skin.php
index 8cf1e78cb4..dae965710a 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -98,7 +98,7 @@ abstract class Skin extends ContextSource {
 
 		$skinNames = Skin::getSkinNames();
 
-		if ( $key == '' ) {
+		if ( $key == '' || $key == 'default' ) {
 			// Don't return the default immediately;
 			// in a misconfiguration we need to fall back.
 			$key = $wgDefaultSkin;