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

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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 6af860671d1190bdec8c06e6996b4c84bc21b6a9..54850d403de9feb035ce5b5a91ec5d611c9f0cd8 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -26,13 +26,14 @@ class MessagesController < ApplicationController
 
     if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
       flash[:error] = t ".limit_exceeded"
+      render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
       Notifier.message_notification(@message).deliver_now
       redirect_to :action => :inbox
-      return
+    else
+      render :action => "new"
     end
-    render :action => "new"
   end
 
   # Allow the user to reply to another message.