X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ecb53b8692cbaac262fba5b1baa632d7cef5353..059d39500617ef003def3464edf85ac4381eafad:/config/initializers/oauth.rb?ds=inline diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 9179e431f..fbe4ad219 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -16,7 +16,7 @@ module OAuth def unescape(value) value.to_s.gsub(/%\h{2}/) do |c| - c[1..-1].to_i(16).chr + c[1..].to_i(16).chr end.force_encoding(Encoding::UTF_8) end end @@ -40,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