From: Tom Hughes <tom@compton.nu>
Date: Thu, 22 Mar 2012 19:47:24 +0000 (+0000)
Subject: Handle change from @to_user to @this_user for new message action
X-Git-Tag: live~5686
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5270a07bc5cfa89576d525e3e5efc8df45c63f12?ds=inline

Handle change from @to_user to @this_user for new message action
---

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 79a0b861a..e34aad37d 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -47,7 +47,7 @@ class MessageController < ApplicationController
     if message.to_user_id == @user.id then
       @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
       @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
-      @to_user = User.find(message.from_user_id)
+      @this_user = User.find(message.from_user_id)
 
       render :action => 'new'
     else
diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index a9dfb520f..ed95e2252 100644
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -1,8 +1,8 @@
-<h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@to_user.display_name), {:controller => 'user', :action => 'view', :display_name => @to_user.display_name})) %></h2>
+<h2><%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h2>
 
 <%= error_messages_for 'message' %>
 
-<%= form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %>
+<%= form_for :message, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %>
   <table>
     <tr valign="top">
       <td class="fieldName"><%= t'message.new.subject' %></td>