X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e9ad6d852c437a00e6cf9f0f529525a3b33d9901..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/controllers/messages_controller.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 2047c4614..cc311f93f 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -24,9 +24,9 @@ class MessagesController < ApplicationController @message = Message.new(message_params) @message.recipient = @user @message.sender = current_user - @message.sent_on = Time.now.getutc + @message.sent_on = Time.now.utc - if current_user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= Settings.max_messages_per_hour + if current_user.sent_messages.where("sent_on >= ?", Time.now.utc - 1.hour).count >= current_user.max_messages_per_hour flash.now[:error] = t ".limit_exceeded" render :action => "new" elsif @message.save @@ -57,7 +57,7 @@ class MessagesController < ApplicationController render :action => "new" else flash[:notice] = t ".wrong_user", :user => current_user.display_name - redirect_to :controller => "users", :action => "login", :referer => request.fullpath + redirect_to login_path(:referer => request.fullpath) end rescue ActiveRecord::RecordNotFound @title = t "messages.no_such_message.title" @@ -74,7 +74,7 @@ class MessagesController < ApplicationController @message.save else flash[:notice] = t ".wrong_user", :user => current_user.display_name - redirect_to :controller => "users", :action => "login", :referer => request.fullpath + redirect_to login_path(:referer => request.fullpath) end rescue ActiveRecord::RecordNotFound @title = t "messages.no_such_message.title" @@ -119,11 +119,9 @@ class MessagesController < ApplicationController if @message.save && !request.xhr? flash[:notice] = t ".destroyed" - if params[:referer] - redirect_to safe_referer(params[:referer]) - else - redirect_to :action => :inbox - end + referer = safe_referer(params[:referer]) if params[:referer] + + redirect_to referer || { :action => :inbox } end rescue ActiveRecord::RecordNotFound @title = t "messages.no_such_message.title"