From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Fri, 19 Jun 2009 22:53:16 +0000 (+0000)
Subject: merge 15807:16012 from rails_port
X-Git-Tag: live~6847^2~17
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ff03138a978406b431da71aba64941d87b509098

merge 15807:16012 from rails_port
---

ff03138a978406b431da71aba64941d87b509098
diff --cc app/views/user/view.html.erb
index 6e54fbebb,5fdea140f..0dbc09dd3
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@@ -9,9 -9,9 +9,9 @@@
  | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
  <% else %>
  <!-- Displaying another user's profile page -->
- <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+ <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
  | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
 -| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
 +| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
  | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
  | <% if @user and @user.is_friends_with?(@this_user) %>
    <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>