[Git][noosfero/noosfero][stable-1.7] Merge branch 'html-safe-categories' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.7 at Noosfero / noosfero


Commits:
89f47deb by Rodrigo Souto at 2017-01-23T17:18:54+00:00
Merge branch 'html-safe-categories' into 'master'

html-safe: category index

See merge request !1082
- - - - -


1 changed file:

- app/helpers/search_helper.rb


Changes:

=====================================
app/helpers/search_helper.rb
=====================================
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -50,9 +50,9 @@ module SearchHelper
   end
 
   def category_context(category, url)
-    content_tag('div', category.full_name + _(', ') +
+    content_tag('div', (category.full_name + _(', ') +
         link_to(_('search in all categories'),
-          url.merge(:category_path => [], :action => (params[:action] == 'category_index' ? 'index' : params[:action]) )),
+          url.merge(:category_path => [], :action => (params[:action] == 'category_index' ? 'index' : params[:action]) ))).html_safe,
       :align => 'center', :class => 'search-category-context') if category
   end
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/89f47deb7305b70a7774c3193166d0935fd4bff2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170123/d7c9908b/attachment.html>