From fd2617d78a1bfa0890d276c46633657be4e554d7 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Fri, 8 Aug 2014 10:40:58 +0100
Subject: [PATCH] SkinFallback: Use Config instead of globals

Change-Id: I2f03f649cdfd334f842d473eaa7613e17f112ab5
---
 includes/SkinFallback.php | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/includes/SkinFallback.php b/includes/SkinFallback.php
index ab72a38e25..f50eabc814 100644
--- a/includes/SkinFallback.php
+++ b/includes/SkinFallback.php
@@ -33,19 +33,16 @@ class SkinFallbackTemplate extends BaseTemplate {
 	 * @return array
 	 */
 	private function findInstalledSkins() {
-		global $wgStyleDirectory;
-
+		$styleDirectory = $this->config->get( 'StyleDirectory' ); // @todo we should inject this directly?
 		// Get all subdirectories which might contains skins
-		$possibleSkins = scandir( $wgStyleDirectory );
-		$possibleSkins = array_filter( $possibleSkins, function ( $maybeDir ) {
-			global $wgStyleDirectory;
-			return $maybeDir !== '.' && $maybeDir !== '..' && is_dir( "$wgStyleDirectory/$maybeDir" );
+		$possibleSkins = scandir( $styleDirectory );
+		$possibleSkins = array_filter( $possibleSkins, function ( $maybeDir ) use ( $styleDirectory ) {
+			return $maybeDir !== '.' && $maybeDir !== '..' && is_dir( "$styleDirectory/$maybeDir" );
 		} );
 
 		// Only keep the ones that contain a .php file with the same name inside
-		$possibleSkins = array_filter( $possibleSkins, function ( $skinDir ) {
-			global $wgStyleDirectory;
-			return is_file( "$wgStyleDirectory/$skinDir/$skinDir.php" );
+		$possibleSkins = array_filter( $possibleSkins, function ( $skinDir ) use ( $styleDirectory ) {
+			return is_file( "$styleDirectory/$skinDir/$skinDir.php" );
 		} );
 
 		return $possibleSkins;
@@ -57,10 +54,9 @@ class SkinFallbackTemplate extends BaseTemplate {
 	 * @return string
 	 */
 	private function buildHelpfulInformationMessage() {
-		global $wgDefaultSkin, $wgValidSkinNames;
-
+		$defaultSkin = $this->config->get( 'DefaultSkin' );
 		$installedSkins = $this->findInstalledSkins();
-		$enabledSkins = $wgValidSkinNames;
+		$enabledSkins = $this->config->get( 'ValidSkinNames' );
 		$enabledSkins = array_change_key_case( $enabledSkins, CASE_LOWER );
 
 		if ( $installedSkins ) {
@@ -81,13 +77,13 @@ class SkinFallbackTemplate extends BaseTemplate {
 			}
 
 			return $this->getMsg( 'default-skin-not-found' )->params(
-				$wgDefaultSkin,
+				$defaultSkin,
 				implode( "\n", $skinsInstalledText ),
 				implode( "\n", $skinsInstalledSnippet )
 			)->parseAsBlock();
 		} else {
 			return $this->getMsg( 'default-skin-not-found-no-skins' )->params(
-				$wgDefaultSkin
+				$defaultSkin
 			)->parseAsBlock();
 		}
 	}
-- 
2.20.1