Merge remote-tracking branch 'upstream/pull/1838'

[rails.git] / app / views / user / _user.html.erb

diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb
index bbc89f965b6a1224542068192b4580849d781724..b1ea3f299c053d4e72e39339d38b8e9dd2b9d0e0 100644 (file)
--- a/app/views/user/_user.html.erb
+++ b/app/views/user/_user.html.erb
@@ -7,19 +7,19 @@
   <td>
     <p>
       <% if user.creation_ip %>
-        <%= t 'user.list.summary',
+        <%= raw t 'user.list.summary',
             :name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name),
             :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
             :date => l(user.creation_time, :format => :friendly)
         %>
       <% else %>
-        <%= t 'user.list.summary_no_ip',
+        <%= raw t 'user.list.summary_no_ip',
             :name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name),
             :date => l(user.creation_time, :format => :friendly)
         %>
       <% end %>
     </p>
-    <%= htmlize(user.description) %>
+    <div class="richtext"><%= user.description.to_html %></div>
   </td>
   <td>
     <%= check_box_tag "user_#{user.id}", "", false, :name => "user[#{user.id}]" %>