github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 21:10:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

keep working even if username is blank

Browse Source
This commit is contained in:
Sam 2015-05-07 13:52:26 +10:00
parent 4191d97d48
commit b7897d24b1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/discourse_single_sign_on.rb
View File

@ -120,7 +120,7 @@ class DiscourseSingleSignOn < SingleSignOn
end end
if SiteSetting.sso_overrides_name && user.name != name if SiteSetting.sso_overrides_name && user.name != name
user.name = name || User.suggest_name(username || email) user.name = name || User.suggest_name(username.blank? ? email : username)
end end
if SiteSetting.sso_overrides_avatar && avatar_url.present? && ( if SiteSetting.sso_overrides_avatar && avatar_url.present? && (