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

[rails.git] / app / controllers / message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 3952b67ca47e1ae40a0b15ff593054e8f146c73e..d167755d4bcf30dc3526ca21de7b094d3cc3ee70 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -4,7 +4,7 @@ class MessageController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
   before_action :require_user
-  before_action :lookup_this_user, :only => [:new]
+  before_action :lookup_user, :only => [:new]
   before_action :check_database_readable
   before_action :check_database_writable, :only => [:new, :reply, :mark]
   before_action :allow_thirdparty_images, :only => [:new, :read]
@@ -19,7 +19,7 @@ class MessageController < ApplicationController
         flash[:error] = t "message.new.limit_exceeded"
       else
         @message = Message.new(message_params)
-        @message.recipient = @this_user
+        @message.recipient = @user
         @message.sender = current_user
         @message.sent_on = Time.now.getutc
 
@@ -31,7 +31,7 @@ class MessageController < ApplicationController
       end
     end
 
-    @message ||= Message.new(message_params.merge(:recipient => @this_user))
+    @message ||= Message.new(message_params.merge(:recipient => @user))
     @title = t "message.new.title"
   end