From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Fri, 16 Jul 2010 13:57:03 +0000 (+0000)
Subject: When we have a bogus useskin value, fallback to $wgDefaultSkin if that value is sane... 
X-Git-Tag: 1.31.0-rc.0~36129
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=4669d5d5ea4ba9255a954a9c9c1ddff31b7ad781;p=lhc%2Fweb%2Fwiklou.git

When we have a bogus useskin value, fallback to $wgDefaultSkin if that value is sane. Fallback to hardcoded "vector" default if $wgDefaultSkin is bogus. Users who still have amathyst selected as their skin preference, should now get vector instead of monobook. Follow up to r66383.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 9495c07385..b007050f2b 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -115,8 +115,10 @@ class Skin extends Linker {
 
 		if( isset( $skinNames[$key] ) ) {
 			return $key;
+		} else if( isset( $skinNames[$wgDefaultSkin] ) ) {
+			return $wgDefaultSkin;
 		} else {
-			return 'monobook';
+			return 'vector';
 		}
 	}