Merge pull request #6238 from LeoMcA/fix-fsl

FIX: don't require auth providers to set full_screen_login_setting
2018-08-06 10:29:22 +01:00 · 2018-08-06 10:29:22 +01:00 · 3ffe084384
parent 812add18bd 9b04921616
commit 3ffe084384
1 changed files with 1 additions and 0 deletions
--- a/app/serializers/auth_provider_serializer.rb
+++ b/app/serializers/auth_provider_serializer.rb
@ -15,6 +15,7 @@ class AuthProviderSerializer < ApplicationSerializer

  def full_screen_login
    return SiteSetting.send(object.full_screen_login_setting) if object.full_screen_login_setting
+    return object.full_screen_login if object.full_screen_login
    false
  end