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

FIX: Prevent error when primary email is missing (#11446)

Browse Source
This commit is contained in:
Gerhard Schlager 2020-12-09 18:14:45 +01:00 committed by GitHub
parent b572ca6da0
commit 538e1142e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -1240,7 +1240,7 @@ class User < ActiveRecord::Base
end end
def email def email
primary_email.email primary_email&.email
end end
def email=(new_email) def email=(new_email)

2
app/services/user_merger.rb
View File

@ -369,7 +369,7 @@ class UserMerger
def log_merge def log_merge
logger = StaffActionLogger.new(@acting_user || Discourse.system_user) logger = StaffActionLogger.new(@acting_user || Discourse.system_user)
logger.log_user_merge(@target_user, @source_user.username, @source_primary_email) logger.log_user_merge(@target_user, @source_user.username, @source_primary_email || "")
end end
def update_user_id(table_name, opts = {}) def update_user_id(table_name, opts = {})