From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 28 May 2006 23:11:41 +0000 (+0000)
Subject: (bug 4033) Respect $wgStyleDirectory when checking available skins
X-Git-Tag: 1.31.0-rc.0~56982
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=7b9166947f6449c90bcdaadafcfe79f36aa2ef19;p=lhc%2Fweb%2Fwiklou.git

(bug 4033) Respect $wgStyleDirectory when checking available skins
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4a02a0f71f..7117ec0fb2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -374,6 +374,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   preceding colon, allowing prettied-up messages
 * (bug 6040) Run pre-save transform before calculating the diff. when doing a
   "show changes" operation in the editor
+* (bug 4033) Respect $wgStyleDirectory when checking available skins
 
 == Compatibility ==
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 46a2fa921f..5246e2a812 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -12,12 +12,12 @@ if ( ! defined( 'MEDIAWIKI' ) )
 require_once( 'Linker.php' );
 require_once( 'Image.php' );
 
-# Get a list of all skins available in /skins/
+# 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
 #
 
-$skinDir = dir($IP.'/skins');
+$skinDir = dir( $wgStyleDirectory );
 
 # while code from www.php.net
 while (false !== ($file = $skinDir->read())) {