X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6c2432ae423c6744b8443c63d0e02e1ccc2d3011..843635e1b3b5e200da5099e8a1ec3d805676bcb9:/app/controllers/messages_controller.rb?ds=sidebyside

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index dce0099e5..2047c4614 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -26,14 +26,15 @@ class MessagesController < ApplicationController
     @message.sender = current_user
     @message.sent_on = Time.now.getutc
 
-    if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR
-      flash[:error] = t ".limit_exceeded"
+    if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= Settings.max_messages_per_hour
+      flash.now[:error] = t ".limit_exceeded"
       render :action => "new"
     elsif @message.save
       flash[:notice] = t ".message_sent"
-      Notifier.message_notification(@message).deliver_later
+      UserMailer.message_notification(@message).deliver_later
       redirect_to :action => :inbox
     else
+      @title = t "messages.new.title"
       render :action => "new"
     end
   end
@@ -119,7 +120,7 @@ class MessagesController < ApplicationController
       flash[:notice] = t ".destroyed"
 
       if params[:referer]
-        redirect_to params[:referer]
+        redirect_to safe_referer(params[:referer])
       else
         redirect_to :action => :inbox
       end