From b7897d24b1d628be392034451757aba8ba6aeb82 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 7 May 2015 13:52:26 +1000
Subject: [PATCH] keep working even if username is blank
---
app/models/discourse_single_sign_on.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 4db846f93..db2387923 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -120,7 +120,7 @@ class DiscourseSingleSignOn < SingleSignOn
end
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
if SiteSetting.sso_overrides_avatar && avatar_url.present? && (