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

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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index a55690951141fd8e774baa4833b6a23e2e923aa4..53ae1dbd726fe17a9a7e1a98d45d4e4de832800d 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -27,7 +27,7 @@ class MessagesController < ApplicationController
     @message.sent_on = Time.now.getutc
 
     if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= Settings.max_messages_per_hour
     @message.sent_on = Time.now.getutc
 
     if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= Settings.max_messages_per_hour

-      flash[:error] = t ".limit_exceeded"
+      flash.now[:error] = t ".limit_exceeded"

       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"


@@ -120,7 +120,7 @@ class MessagesController < ApplicationController
       flash[:notice] = t ".destroyed"
 
       if params[:referer]
       flash[:notice] = t ".destroyed"
 
       if params[:referer]

-        redirect_to params[:referer]
+        redirect_to safe_referer(params[:referer])

       else
         redirect_to :action => :inbox
       end
       else
         redirect_to :action => :inbox
       end