github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:11:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

allow magic login route emails even when emails are disabled

Browse Source
This commit is contained in:
Arpit Jalan
2016-04-08 10:53:16 +05:30
parent eafba0c0c0
commit c5794ab0f6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/email/sender.rb
View File

@ -22,7 +22,7 @@ module Email
end
def send
return if SiteSetting.disable_emails
return if SiteSetting.disable_emails && @email_type.to_s != "admin_login"
return if ActionMailer::Base::NullMail === @message
return if ActionMailer::Base::NullMail === (@message.message rescue nil)