[Slim-Checkins] r33704 - /7.7/trunk/server/Slim/GUI/ControlPanel.pm

Author: mherger
Date: Mon Nov 14 03:14:09 2011
New Revision: 33704

URL: http://svn.slimdevices.com/slim?rev=33704&view=rev
Log:
Fixed Bug: 17762
Description: we can't request strings through JSON/RPC before the authentication has succeeded. Pull the string from the strings.txt file instead.

Modified:
    7.7/trunk/server/Slim/GUI/ControlPanel.pm

Modified: 7.7/trunk/server/Slim/GUI/ControlPanel.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/GUI/ControlPanel.pm?rev=33704&r1=33703&r2=33704&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/GUI/ControlPanel.pm (original)
+++ 7.7/trunk/server/Slim/GUI/ControlPanel.pm Mon Nov 14 03:14:09 2011
@@ -397,7 +397,7 @@
 	$ua->timeout(2);
 	
 	if ($credentials && $credentials->{username} && $credentials->{password}) {
-		$ua->credentials($baseUrl, string('SQUEEZEBOX_SERVER'), $credentials->{username}, $credentials->{password});
+		$ua->credentials($baseUrl, Slim::Utils::Light::string('SQUEEZEBOX_SERVER'), $credentials->{username}, $credentials->{password});
 	}
 
 	return if $needAuthentication;
@@ -418,7 +418,7 @@
 				password => $loginDialog->password,
 			};
 		
-			$ua->credentials($baseUrl, string('SQUEEZEBOX_SERVER'), $credentials->{username}, $credentials->{password});
+			$ua->credentials($baseUrl, Slim::Utils::Light::string('SQUEEZEBOX_SERVER'), $credentials->{username}, $credentials->{password});
 		
 			$response = $ua->request($req);
 		}