Merge remote-tracking branch 'upstream/pull/2400'

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index b00df09d0d20099de29f46d5588ec3fdc06d7b31..6190831f7ada6b8fa18c33a1c05b4036049bb351 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -1,7 +1,9 @@
 module Auth
   PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|
 module Auth
   PROVIDERS = { "None" => "", "OpenID" => "openid" }.tap do |providers|

-    providers["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
-    providers["Facebook"] = "facebook" if defined?(FACEBOOK_AUTH_ID)
-    providers["Windows Live"] = "windowslive" if defined?(WINDOWSLIVE_AUTH_ID)
+    providers["Google"] = "google" if Settings.key?(:google_auth_id)
+    providers["Facebook"] = "facebook" if Settings.key?(:facebook_auth_id)
+    providers["Windows Live"] = "windowslive" if Settings.key?(:windowslive_auth_id)
+    providers["GitHub"] = "github" if Settings.key?(:github_auth_id)
+    providers["Wikipedia"] = "wikipedia" if Settings.key?(:wikipedia_auth_id)

   end.freeze
 end
   end.freeze
 end