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 66f6cd3bc0d4d2d1b92aeb83428b1c3e4314998d..b1ea3f299c053d4e72e39339d38b8e9dd2b9d0e0 100644 (file)
--- a/app/views/user/_user.html.erb
+++ b/app/views/user/_user.html.erb
@@ -6,13 +6,20 @@
   </td>
   <td>
     <p>
-      <%= t 'user.list.summary',
-          :name => h(user.display_name),
-          :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
-          :date => l(user.creation_time, :format => :friendly)
-      %>
+      <% if user.creation_ip %>
+        <%= 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 %>
+        <%= 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}]" %>