IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Merging users failed when PM was sent to source and target user

Browse Source
This commit is contained in:
Gerhard Schlager
2018-04-24 11:55:39 +02:00
committed by Robin Ward
parent c11e8c9a64
commit ec29869350
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/user_merger.rb
View File

@@ -355,7 +355,7 @@ class UserMerger
conditions: ["x.action_type = y.action_type",
"x.target_topic_id IS NOT DISTINCT FROM y.target_topic_id",
"x.target_post_id IS NOT DISTINCT FROM y.target_post_id",
"x.acting_user_id IN (:source_user_id, :target_user_id)"])
"(x.acting_user_id IN (:source_user_id, :target_user_id) OR x.acting_user_id IS NOT DISTINCT FROM y.acting_user_id)"])
update_user_id(:user_actions,
user_id_column_name: "acting_user_id",
conditions: ["x.action_type = y.action_type",