X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca893c1153e968c1c8a03286ec5450e31e451948..4a62dac9c06bcdb7c2acac75e9168bf654c4c64d:/app/controllers/messages_controller.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index adfbd9157..e4d6c70d9 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -11,7 +11,8 @@ class MessagesController < ApplicationController before_action :lookup_user, :only => [:new, :create] before_action :check_database_readable before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy] - before_action :allow_thirdparty_images, :only => [:new, :create, :show] + + allow_thirdparty_images :only => [:new, :create, :show] # Show a message def show @@ -116,7 +117,7 @@ class MessagesController < ApplicationController # Set the message as being read or unread. def mark - @message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user)).find(params[:message_id]) + @message = current_user.messages.find(params[:message_id]) if params[:mark] == "unread" message_read = false notice = t ".as_unread"