From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Aug 2023 17:10:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4210'
X-Git-Tag: live~1570
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a99450f558a3b39d4d4f7143f5da2628b2cbba2c?hp=0c2f5a8ad1568d3667363c5024faaf5f2ac10b8e

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

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index e0b5b05d3..adb53b43b 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -57,7 +57,7 @@ class MessagesController < ApplicationController
 
   # Destroy the message.
   def destroy
-    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:id])
+    @message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user.id)).find(params[:id])
     @message.from_user_visible = false if @message.sender == current_user
     @message.to_user_visible = false if @message.recipient == current_user
     if @message.save && !request.xhr?
@@ -109,7 +109,7 @@ class MessagesController < ApplicationController
 
   # Set the message as being read or unread.
   def mark
-    @message = Message.where("to_user_id = ? OR from_user_id = ?", current_user.id, current_user.id).find(params[:message_id])
+    @message = Message.where(:recipient => current_user).or(Message.where(:sender => current_user)).find(params[:message_id])
     if params[:mark] == "unread"
       message_read = false
       notice = t ".as_unread"