[Slim-Checkins] r12445 - in /trunk/server/Slim/Web/Pages: LiveSearch.pm Search.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sun Jul 29 15:39:30 2007
New Revision: 12445

URL: http://svn.slimdevices.com?rev=12445&view=rev
Log:
Bug: 5196
Description: fix search query param for non-latin chars


Modified:
    trunk/server/Slim/Web/Pages/LiveSearch.pm
    trunk/server/Slim/Web/Pages/Search.pm

Modified: trunk/server/Slim/Web/Pages/LiveSearch.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages/LiveSearch.pm?rev=12445&r1=12444&r2=12445&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages/LiveSearch.pm (original)
+++ trunk/server/Slim/Web/Pages/LiveSearch.pm Sun Jul 29 15:39:30 2007
@@ -51,8 +51,9 @@
 			$count++;
 		}
 
-		push @xml, sprintf("<div class=\"even\">\n<div class=\"browsedbListItem\"><hr width=\"75%%\"/><br/>%s \"$query\": $total<br/><br/></div></div>", 
-			Slim::Utils::Strings::string(uc($type . 'SMATCHING'))
+		push @xml, sprintf("<div class=\"even\">\n<div class=\"browsedbListItem\"><hr width=\"75%%\"/><br/>%s \"%s\": $total<br/><br/></div></div>", 
+			Slim::Utils::Strings::string(uc($type . 'SMATCHING')),
+			Slim::Utils::Unicode::utf8decode($query)
 		);
 
 		push @xml, @output if $count;

Modified: trunk/server/Slim/Web/Pages/Search.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages/Search.pm?rev=12445&r1=12444&r2=12445&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages/Search.pm (original)
+++ trunk/server/Slim/Web/Pages/Search.pm Sun Jul 29 15:39:30 2007
@@ -85,6 +85,8 @@
 
 			fillInSearchResults($params, $rs, [ 'manualSearch=1' ]);
 		}
+		
+		$params->{'query'} = Slim::Utils::Unicode::utf8decode($query);
 
 		return Slim::Web::HTTP::filltemplatefile("search.html", $params);
 
@@ -264,6 +266,8 @@
 	}
 
 	fillInSearchResults($params, $rs, \@qstring, 1);
+	
+	$params->{'query'} = Slim::Utils::Unicode::utf8decode($query);
 
 	return Slim::Web::HTTP::filltemplatefile("advanced_search.html", $params);
 }