X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f498a9287a25fc284ef0e1fd90ea8ca91e661183..343e01bb86da6b346e035796121aba033bb26c29:/app/views/user/view.rhtml diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 34a30dd42..4c97257d2 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -1,12 +1,12 @@

<%= @this_user.display_name %>

-<% if @this_user.id == @user.id %> +<% if @user and @this_user.id == @user.id %> <%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %>

<% else %> - <%= link_to 'send message', :controller => 'user', :action => 'message', :display_name => @user.display_name %>

| - <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @user.display_name %>

+ <%= link_to 'send message', :controller => 'user', :action => 'message', :display_name => @this_user.display_name %>

| + <%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>

<% end %> -<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @user.display_name %>

+<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %>

<%= simple_format(@this_user.description) %>