Merge remote-tracking branch 'openstreetmap/pull/1436'

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

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index f4c465c93e6cfe2037235ce75cf5daba5308a7d6..450313e6247ca6262f14f0dd892cd4ad084770e4 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -28,10 +28,10 @@ class MessageController < ApplicationController
           redirect_to :action => "inbox", :display_name => @user.display_name
         end
       end
-    else
-      @message ||= Message.new(message_params.merge(:recipient => @this_user))
-      @title = t "message.new.title"
     end
+
+    @message ||= Message.new(message_params.merge(:recipient => @this_user))
+    @title = t "message.new.title"
   end
 
   # Allow the user to reply to another message.