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

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

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index ef50ccaf2fb4bffa27c19ce8950fbbd6b7e13209..2fb14b6bdf7056f2196e4c476905f49480e0d758 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -4,10 +4,10 @@
   </td>
   <td>
     <p>
   </td>
   <td>
     <p>

-      <% if user.creation_ip %>
+      <% if user.creation_address %>

         <%= t "users.index.summary_html",
               :name => link_to(user.display_name, user),
         <%= t "users.index.summary_html",
               :name => link_to(user.display_name, user),

-              :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
+              :ip_address => link_to(user.creation_address, :ip => user.creation_address),

               :date => l(user.created_at, :format => :friendly) %>
       <% else %>
         <%= t "users.index.summary_no_ip_html",
               :date => l(user.created_at, :format => :friendly) %>
       <% else %>
         <%= t "users.index.summary_no_ip_html",