X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/89456c8b40f7510941dea7ac1eb8441614d61b9a..e16f1b2fe640e6f5fbf8e32ac7ddc6f909ab55d3:/config/initializers/oauth.rb

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 276fd350c..fbe4ad219 100644
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -13,6 +13,12 @@ module OAuth
         end.join
       end.force_encoding(Encoding::US_ASCII)
     end
+
+    def unescape(value)
+      value.to_s.gsub(/%\h{2}/) do |c|
+        c[1..].to_i(16).chr
+      end.force_encoding(Encoding::UTF_8)
+    end
   end
 
   module RequestProxy
@@ -34,28 +40,28 @@ module OpenStreetMap
     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
-        super options
+        super(options)
       end
     end
 
     module ClassMethods
       def included(controller)
         controller.class_eval do
-          def self.before_filter(*names, &blk)
-            before_action(*names, &blk)
+          def self.before_filter(...)
+            before_action(...)
           end
 
-          def self.skip_before_filter(*names, &blk)
-            skip_before_action(*names, &blk)
+          def self.skip_before_filter(...)
+            skip_before_action(...)
           end
         end
 
-        super controller
+        super(controller)
       end
     end
   end