[Git][noosfero/noosfero][master] 2 commits: html-safe: article version author link

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
597bbd31 by Rodrigo Souto at 2016-12-26T16:00:58-03:00
html-safe: article version author link

- - - - -
479cdb6f by Rodrigo Souto at 2017-01-02T12:47:16+00:00
Merge branch 'html-safe-article-version' into 'master'

html-safe: article version author link

See merge request !1075
- - - - -


1 changed file:

- app/views/content_viewer/article_versions.html.erb


Changes:

=====================================
app/views/content_viewer/article_versions.html.erb
=====================================
--- a/app/views/content_viewer/article_versions.html.erb
+++ b/app/views/content_viewer/article_versions.html.erb
@@ -14,7 +14,7 @@
         <%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
         <%= link_to(_("Version %s") % v.version, @page.url.merge(:version => v.version)) %>
         <%= @page.version == v.version ? _('(current)') : '' %>
-        <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
+        <span class='updated-by'><%= _('by %{author}').html_safe % {:author => link_to(@page.author_name(v.version), @page.author_url(v.version))} %></span>
         <span class='updated-on'><%= show_time(v.updated_at) %></span>
       </li>
     <% end %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/5899e51e292b78f206f2937e4103699a3b2dcca2...479cdb6f3c6f304dace002893ae9574a390e6e78
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170102/e9c7eba9/attachment.html>