FIX: if approving a user when must_approve_users is false, don't send an email

2025-02-25 18:55:32 -06:00 · 2015-05-04 15:30:25 -04:00
parent b84c4ef0c6
commit 963ebf5963
2 changed files with 15 additions and 6 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -850,11 +850,13 @@ class User < ActiveRecord::Base
  end

  def send_approval_email
-    Jobs.enqueue(:user_email,
-      type: :signup_after_approval,
-      user_id: id,
-      email_token: email_tokens.first.token
-    )
+    if SiteSetting.must_approve_users
+      Jobs.enqueue(:user_email,
+        type: :signup_after_approval,
+        user_id: id,
+        email_token: email_tokens.first.token
+      )
+    end
  end

  def set_default_email_digest