fix tag search with accented latin characters

Francisco Júnior
1 parent cd4eff3c
Showing 2 changed files with 7 additions and 1 deletions Show diff stats
app/controllers/public/search_controller.rb
test/functional/search_controller_test.rb
@@ -137,7 +137,8 @@ class SearchController &lt; PublicController
   def tag
     @tag = params[:tag]
-    @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
+    tag_str = @tag.kind_of?(Array) ? @tag.join(" ") : @tag.to_str
+    @tag_cache_key = "tag_#{CGI.escape(tag_str)}_env_#{environment.id.to_s}_page_#{params[:npage]}"
     if is_cache_expired?(@tag_cache_key)
       @searches[@asset] = {:results => environment.articles.tagged_with(@tag).paginate(paginate_options)}
     end
@@ -772,6 +772,11 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equivalent [t1,t2,c1,c2,c3,c4] , assigns(:searches)[:communities][:results]
   end
+  should 'not raise an exception if tag query contains accented latin characters' do
+    tag_query = 'àáâãäå'
+    assert_nothing_raised(NoMethodError) { get :tag, :tag => tag_query }
+  end
+
   should 'not allow query injection' do
     injection = '<iMg SrC=x OnErRoR=document.documentElement.innerHTML=1>SearchParam'
     get :tag, :tag => injection