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

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

diff --git a/app/models/request_token.rb b/app/models/request_token.rb
index ed0cc3ae4c89164f322f32380341f9dbcab0a7c8..adeabb18497ff4fd7e0556df56aecd16579a9be1 100644 (file)
--- a/app/models/request_token.rb
+++ b/app/models/request_token.rb
@@ -42,7 +42,7 @@ class RequestToken < OauthToken
     return false if authorized?
 
     self.user = user
     return false if authorized?
 
     self.user = user

-    self.authorized_at = Time.now
+    self.authorized_at = Time.now.utc

     self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10?
     save
   end
     self.verifier = OAuth::Helper.generate_key(20)[0, 20] unless oauth10?
     save
   end


@@ -77,6 +77,6 @@ class RequestToken < OauthToken
   end
 
   def oauth10?
   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
   end
 end