[Slim-Checkins] r33728 - /7.7/trunk/server/Slim/Control/Queries.pm

Author: agrundman
Date: Mon Nov 21 07:00:32 2011
New Revision: 33728

URL: http://svn.slimdevices.com/slim?rev=33728&view=rev
Log:
Bug 17609, do not update the global VA object if we are doing a per-request string in a different language

Modified:
    7.7/trunk/server/Slim/Control/Queries.pm

Modified: 7.7/trunk/server/Slim/Control/Queries.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Control/Queries.pm?rev=33728&r1=33727&r2=33728&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Control/Queries.pm (original)
+++ 7.7/trunk/server/Slim/Control/Queries.pm Mon Nov 21 07:00:32 2011
@@ -873,15 +873,16 @@
 			
 			# bug 15328 - get the VA name in the language requested by the client
 			#             but only do so if the user isn't using a custom name
-			if ( $vaObj->name eq Slim::Utils::Strings::string('VARIOUSARTISTS') ) {
-				
-				# we can change the name as it will be updated anyway next them the VA object is requested
-				$vaObj->name( $request->string('VARIOUSARTISTS') );
+			my $vaName     = $vaObj->name;
+			my $vaNamesort = $vaObj->namesort;
+			if ( $vaName eq Slim::Utils::Strings::string('VARIOUSARTISTS') ) {
+				$vaName     = $request->string('VARIOUSARTISTS');
+				$vaNamesort = Slim::Utils::Text::ignoreCaseArticles($vaName);
 			}
 			
 			$id       = $vaObj->id;
-			$name     = $vaObj->name;
-			$namesort = $vaObj->namesort;
+			$name     = $vaName;
+			$namesort = $vaNamesort;
 			$mixable  = 0;
 			
 			$process->();