github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: send activation email when accepting invite if password is set

Browse Source
This commit is contained in:
Arpit Jalan
2017-04-15 14:48:05 +05:30
parent c155b05595
commit 0954367bf4
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -797,7 +797,7 @@ class User < ActiveRecord::Base
end
def find_email
last_sent_email_address || email
last_sent_email_address.present? && EmailValidator.email_regex =~ last_sent_email_address ? last_sent_email_address : email
end
def tl3_requirements