[Slim-Checkins] r10087 - /trunk/server/Slim/Web/HTTP.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Thu Sep 28 19:11:54 2006
New Revision: 10087

URL: http://svn.slimdevices.com?rev=10087&view=rev
Log:
Bug: 4171
Description: harcode Default2 bypass to avoid a loop when stream.mp3 is used


Modified:
    trunk/server/Slim/Web/HTTP.pm

Modified: trunk/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/HTTP.pm?rev=10087&r1=10086&r2=10087&view=diff
==============================================================================
--- trunk/server/Slim/Web/HTTP.pm (original)
+++ trunk/server/Slim/Web/HTTP.pm Thu Sep 28 19:11:54 2006
@@ -1953,9 +1953,11 @@
 
 	my $skin = $params->{'skinOverride'} || Slim::Utils::Prefs::get('skin');
 
-	# BUG 4171:  only generate from valid skins, falling back on default if invalid.
-	$skin = isaSkin($skin);
-
+	# Default2 is gone, so redirect to Default.
+	if ($skin =~ /^(?:Default2)$/i) {
+		$skin = 'Default';
+	}
+	
 	$::d_http && msg("generating from $path\n");
 
 	# Make sure we have a skin template for fixHttpPath to use.