From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 26 Dec 2010 22:24:55 +0000 (+0000)
Subject: When running phpunit with globals backup, $skinsInitialised will be kept to true... 
X-Git-Tag: 1.31.0-rc.0~33074
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=ed74c1549c6fce65e95eafa5df0b1d811c3dfa26;p=lhc%2Fweb%2Fwiklou.git

When running phpunit with globals backup, $skinsInitialised will be kept to true, but $wgValidSkinNames reset to an empty array. Workarounding.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 7da81b4b10..fe57e5f518 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -41,7 +41,7 @@ class Skin extends Linker {
 		global $wgValidSkinNames;
 		static $skinsInitialised = false;
 
-		if ( !$skinsInitialised ) {
+		if ( !$skinsInitialised || !count( $wgValidSkinNames ) ) {
 			# Get a list of available skins
 			# Build using the regular expression '^(.*).php$'
 			# Array keys are all lower case, array value keep the case used by filename