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

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

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 57b89564ffc239bef207abf47fe0abadfe9d51b0..812e6610d9e67a46b1df270cd5a201cf41d3dff4 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -40,12 +40,12 @@ module OpenStreetMap
     def render(options = {})
       text = options.delete(:text)
       if text
     def render(options = {})
       text = options.delete(:text)
       if text

-        super options.merge(:plain => text)
+        super(options.merge(:plain => text))

       elsif options.delete(:nothing)
         status = options.delete(:status) || :ok
         head status, options
       else
       elsif options.delete(:nothing)
         status = options.delete(:status) || :ok
         head status, options
       else

-        super options
+        super

       end
     end
 
       end
     end
 


@@ -61,7 +61,7 @@ module OpenStreetMap
           end
         end
 
           end
         end
 

-        super controller
+        super

       end
     end
   end
       end
     end
   end