Ticket #6752: use_query_params.diff
| File use_query_params.diff, 1.7 kB (added by ulysses, 3 years ago) |
|---|
-
lib/action_controller/routing.rb
old new 333 333 # the query string. (Never use keys from the recalled request when building the 334 334 # query string.) 335 335 336 method_decl = "def generate(#{args})\npath, hash = generate_raw(options, hash, expire_on)\nappend_query_string(path, hash, extra_keys( hash, expire_on))\nend"336 method_decl = "def generate(#{args})\npath, hash = generate_raw(options, hash, expire_on)\nappend_query_string(path, hash, extra_keys(options))\nend" 337 337 instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})" 338 338 339 method_decl = "def generate_extras(#{args})\npath, hash = generate_raw(options, hash, expire_on)\n[path, extra_keys( hash, expire_on)]\nend"339 method_decl = "def generate_extras(#{args})\npath, hash = generate_raw(options, hash, expire_on)\n[path, extra_keys(options)]\nend" 340 340 instance_eval method_decl, "generated code (#{__FILE__}:#{__LINE__})" 341 341 raw_method 342 342 end … … 1224 1224 # drop the leading '/' on the controller name 1225 1225 options[:controller] = options[:controller][1..-1] if options[:controller] && options[:controller][0] == ?/ 1226 1226 merged = recall.merge(options) 1227 1227 1228 1228 if named_route 1229 1229 path = named_route.generate(options, merged, expire_on) 1230 1230 raise RoutingError, "#{named_route_name}_url failed to generate from #{options.inspect}, expected: #{named_route.requirements.inspect}, diff: #{named_route.requirements.diff(options).inspect}" if path.nil?
