kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Cleanup generate_extras build/parse mess

Browse source
This commit is contained in:
Joshua Peek 2009-12-10 22:57:07 -06:00
parent 1b82590c36
commit d1191507bc
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -433,7 +433,7 @@ module ActionDispatch
raise ActionController::RoutingError, "No route matches #{options.inspect}"
end
uri, params = result
path, params = result
params.each do |k, v|
if v
params[k] = v
@ -442,16 +442,10 @@ module ActionDispatch
end
end
uri << "?#{params.to_query}" if uri && params.any?
path = uri
if path && method == :generate_extras
uri = URI(path)
extras = uri.query ?
Rack::Utils.parse_nested_query(uri.query).keys.map { |k| k.to_sym } :
[]
[uri.path, extras]
[path, params.keys]
elsif path
path << "?#{params.to_query}" if params.any?
path
else
raise ActionController::RoutingError, "No route matches #{options.inspect}"