From 0791c2c96636e9af5992d5d0ea6f991018cf4ef6 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 19 Jan 2017 10:52:24 +0530 Subject: [PATCH] FIX: sso_overrides_avatar should override previously set avatar --- app/models/discourse_single_sign_on.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb index a4c1fd151b..daf64826fa 100644 --- a/app/models/discourse_single_sign_on.rb +++ b/app/models/discourse_single_sign_on.rb @@ -146,7 +146,7 @@ class DiscourseSingleSignOn < SingleSignOn sso_record.last_payload = unsigned_payload sso_record.external_id = external_id else - Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id) if avatar_url.present? + Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.sso_overrides_avatar) if avatar_url.present? user.create_single_sign_on_record( last_payload: unsigned_payload, external_id: external_id, @@ -180,7 +180,7 @@ class DiscourseSingleSignOn < SingleSignOn avatar_changed = sso_record.external_avatar_url != avatar_url if avatar_force_update || avatar_changed || avatar_missing - Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id) + Jobs.enqueue(:download_avatar_from_url, url: avatar_url, user_id: user.id, override_gravatar: SiteSetting.sso_overrides_avatar) end end