Merge remote-tracking branch 'upstream/pull/2983' into master

[rails.git] / config / initializers / oauth.rb

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 421ca2bf9395f503e1f72582aaf201633a877375..2e2f45ab88e1c46667b09719f07ca7880d238936 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -16,6 +16,7 @@ end
 module OpenStreetMap
   module ProviderController
     def self.prepended(mod)
+      super
       mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
     end
 
@@ -52,6 +53,7 @@ module OpenStreetMap
     def oauth1_verify(request, options = {}, &block)
       signature = OAuth::Signature.build(request, options, &block)
       return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
+
       value = signature.verify
       if request.ssl? && !value
         http_request = request.dup