[Git][noosfero/noosfero][stable-1.10] Merge branch 'newsletter-html-safe' into 'master'

[Rodrigo Souto]

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


Commits:
abbd7fcd by Rodrigo Souto at 2018-01-29T14:54:38+00:00
Merge branch 'newsletter-html-safe' into 'master'

newsletter-plugin: fix double escaped unsubscribe link

See merge request noosfero/noosfero!1381

(cherry picked from commit e8e8b9f94d9dae1b203911d11538e701cc6b8cd7)

4ee36a45 newsletter-plugin: fix double escaped unsubscribe link
- - - - -


1 changed file:

- plugins/newsletter/views/newsletter_plugin/unsubscribe.html.erb


Changes:

=====================================
plugins/newsletter/views/newsletter_plugin/unsubscribe.html.erb
=====================================
--- a/plugins/newsletter/views/newsletter_plugin/unsubscribe.html.erb
+++ b/plugins/newsletter/views/newsletter_plugin/unsubscribe.html.erb
@@ -4,7 +4,7 @@
 <%= _("I don't want to receive future newsletter emails from this network.") %>
 </h4>
 
-<%= _('Send an email to %s requesting your unsubscription or click on the button below.') % link_to(environment.contact_email, "mailto:#{environment.contact_email}?subject=#{_('Cancel newsletter subscription')}") %>
+<%= _('Send an email to %s requesting your unsubscription or click on the button below.').html_safe % link_to(environment.contact_email, "mailto:#{environment.contact_email}?subject=#{_('Cancel newsletter subscription')}") %>
 
 <%= button_bar do %>
   <%= button :ok, _('Confirm unsubscription'), {:action => 'confirm_unsubscription'}, :method => 'post' %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/abbd7fcd4e825a2598314ff468c4d7e0826a2bd4

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/abbd7fcd4e825a2598314ff468c4d7e0826a2bd4
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180129/488d8649/attachment-0001.html>