X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbf35e0cf67ee330cd02c2431e0ed6d08681d184..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/controllers/messages_controller.rb?ds=inline diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index dacd00261..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 >= current_user.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 @@ -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"