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

[rails.git] / app / models / request_token.rb

diff --git a/app/models/request_token.rb b/app/models/request_token.rb
index ed0cc3ae4c89164f322f32380341f9dbcab0a7c8..f7c9501b56b3c84ce938a98b4966c4c3d8ac11d3 100644 (file)
--- a/app/models/request_token.rb
+++ b/app/models/request_token.rb
@@ -77,6 +77,6 @@ class RequestToken < OauthToken
   end
 
   def oauth10?
-    (defined? OAUTH_10_SUPPORT) && OAUTH_10_SUPPORT && callback_url.blank?
+    Settings.key?(:oauth_10_support) && Settings.oauth_10_support && callback_url.blank?
   end
 end