[Git][noosfero/noosfero][stable-1.8] Merge branch 'video-data-webversions' into 'master'

[Rodrigo Souto]

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


Commits:
83f4132c by Rodrigo Souto at 2017-06-16T19:09:11+00:00
Merge branch 'video-data-webversions' into 'master'

correct data-webversions double escape

See merge request !1242
- - - - -


1 changed file:

- plugins/html5_video/views/content_viewer/video_channel.html.erb


Changes:

=====================================
plugins/html5_video/views/content_viewer/video_channel.html.erb
=====================================
--- a/plugins/html5_video/views/content_viewer/video_channel.html.erb
+++ b/plugins/html5_video/views/content_viewer/video_channel.html.erb
@@ -45,7 +45,7 @@
                 {
                   'data-poster'      => f.image_preview(:big),
                   'data-download'    => f.public_filename,
-                  'data-webversions' => CGI::escapeHTML(f.web_versions!.to_json),
+                  'data-webversions' => CGI::escapeHTML(f.web_versions!.to_json).html_safe,
                   :style => "background-image:url(#{f.image_preview(:big)})"
                 }) %>
           <ul>



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

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/83f4132c9c653cde0155ee05c50c84d7a5bb734c
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/20170616/1a0398ac/attachment-0001.html>