Mercurial > hg > soundsoftware-site

changeset 1330:441b66f148b6 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTML-safe the active colleagues box
author Chris Cannam
date Thu, 20 Jun 2013 11:32:06 +0100
parents b2ea0641f798
children 1e9b1bdd062e
files app/helpers/activities_helper.rb app/views/my/blocks/_colleagues.html.erb
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/app/helpers/activities_helper.rb	Thu Jun 20 08:47:50 2013 +0100
+++ b/app/helpers/activities_helper.rb	Thu Jun 20 11:32:06 2013 +0100
@@ -112,7 +112,7 @@
       finish = Time.now
       logger.info "render_active_colleagues: took #{finish-start}"
     
-      s
+      s.html_safe
     end
   end
 
--- a/app/views/my/blocks/_colleagues.html.erb	Thu Jun 20 08:47:50 2013 +0100
+++ b/app/views/my/blocks/_colleagues.html.erb	Thu Jun 20 11:32:06 2013 +0100
@@ -5,7 +5,7 @@
 <div id="activity">
   <h3><%=l(:label_my_colleagues)%></h3>
   <div class="activity box" id="active-colleagues">
-    <%= render_active_colleagues(colleagues) %>
+    <%= render_active_colleagues(colleagues).html_safe %>
   </div>
 </div>
 <% end %>