From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 11 Nov 2003 11:23:42 +0000 (+0000)
Subject: Disabling experimental extra skins
X-Git-Tag: 1.1.0~179
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=2cc7c6583ff99abdd2e787720870848103e19231;p=lhc%2Fweb%2Fwiklou.git

Disabling experimental extra skins
---

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 399aa1bc7f..822be3a02e 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -195,7 +195,7 @@ function wfSpecialPreferences()
 	global $wpQuickbar, $wpOldpass, $wpNewpass, $wpRetype;
 	global $wpSkin, $wpMath, $wpDate, $wpEmail, $wpEmailFlag, $wpNick, $wpSearch, $wpRecent;
 	global $wpRows, $wpCols, $wpSaveprefs, $wpReset, $wpHourDiff;
-	global $wpSearchLines, $wpSearchChars, $wpStubs;
+	global $wpSearchLines, $wpSearchChars, $wpStubs, $wgValidSkinNames;
 
 	$wgOut->setPageTitle( wfMsg( "preferences" ) );
 	$wgOut->setArticleFlag( false );
@@ -273,9 +273,15 @@ value=\"$i\"$checked> {$qbs[$i]}</label><br>\n" );
 	# Skin setting
 	#
 	$wgOut->addHTML( "<tr><td valign=top nowrap><b>$sk:</b><br>\n" );
-	for ( $i = 0; $i < count( $skins ); ++$i ) {
-		if ( $i == $wpSkin ) { $checked = " checked"; }
-		else { $checked = ""; }
+	# Only count up to count($wgValidSkinNames) rather than 
+	# count($skins), to allow global disabling of experimental 
+	# skins.
+	for ( $i = 0; $i < count( $wgValidSkinNames ); ++$i ) {
+		if ( $i == $wpSkin ) { 
+			$checked = " checked"; 
+		} else { 
+			$checked = ""; 
+		}
 		$wgOut->addHTML( "<label><input type=radio name=\"wpSkin\"
 value=\"$i\"$checked> {$skins[$i]}</label><br>\n" );
 	}