[Git][noosfero/noosfero][stable-1.7] Merge branch 'html_safe' into 'master'

[Rodrigo Souto]

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


Commits:
22d44cc5 by Rodrigo Souto at 2017-01-31T20:36:29+00:00
Merge branch 'html_safe' into 'master'

Fixes HTML safe for long article leads

See merge request !1098
- - - - -


1 changed file:

- app/views/profile/_create_article.html.erb


Changes:

=====================================
app/views/profile/_create_article.html.erb
=====================================
--- a/app/views/profile/_create_article.html.erb
+++ b/app/views/profile/_create_article.html.erb
@@ -9,7 +9,7 @@
   <div class='profile-activity-lead'>
     <div class='article-name'><%= link_to(activity.params['name'], activity.params['url']) %></div>
     <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
-    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'].html_safe, :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %><small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'].html_safe, :length => 1000, :ommision => '...', :escape => false)).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %><small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
   </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
   <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/22d44cc5bea032d64335b3e2730b398cbc7ad6b3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170131/a7611d86/attachment.html>