When running phpunit with globals backup, $skinsInitialised will be kept to true...

diff --git a/includes/Skin.php b/includes/Skin.php
index 7da81b4..fe57e5f 100644 (file)
--- 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