mirror of
https://github.com/discourse/discourse.git
synced 2026-08-08 20:18:23 -05:00
FIX: Skip sending PM email for user silence (#12240)
We were sending 2 emails for user silencing if a message was provided in the UI. Also always send email for user silence and user suspend with reason regardless of whether message provided.
This commit is contained in:
@@ -124,14 +124,12 @@ class Admin::UsersController < Admin::AdminController
|
||||
end
|
||||
@user.logged_out
|
||||
|
||||
if message.present?
|
||||
Jobs.enqueue(
|
||||
:critical_user_email,
|
||||
type: :account_suspended,
|
||||
user_id: @user.id,
|
||||
user_history_id: user_history.id
|
||||
)
|
||||
end
|
||||
Jobs.enqueue(
|
||||
:critical_user_email,
|
||||
type: :account_suspended,
|
||||
user_id: @user.id,
|
||||
user_history_id: user_history.id
|
||||
)
|
||||
|
||||
DiscourseEvent.trigger(
|
||||
:user_suspended,
|
||||
@@ -345,7 +343,7 @@ class Admin::UsersController < Admin::AdminController
|
||||
keep_posts: true,
|
||||
post_id: params[:post_id]
|
||||
)
|
||||
if silencer.silence && message.present?
|
||||
if silencer.silence
|
||||
Jobs.enqueue(
|
||||
:critical_user_email,
|
||||
type: :account_silenced,
|
||||
|
||||
Reference in New Issue
Block a user