(bug 4033) Respect $wgStyleDirectory when checking available skins

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4a02a0f..7117ec0 100644 (file)
--- 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 46a2fa9..5246e2a 100644 (file)
--- 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())) {