diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-10 22:57:07 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-10 22:57:07 -0600 |
commit | d1191507bc8ffa4f7fe59b1cfb03dfbf6b73a798 (patch) | |
tree | 742b6df218174e5b3f2aaa0b761c343a99525298 /actionpack/lib/action_dispatch/routing | |
parent | 1b82590c36bb1404f7b7a9aa9cf196253685d73f (diff) | |
download | rails-d1191507bc8ffa4f7fe59b1cfb03dfbf6b73a798.tar.gz rails-d1191507bc8ffa4f7fe59b1cfb03dfbf6b73a798.tar.bz2 rails-d1191507bc8ffa4f7fe59b1cfb03dfbf6b73a798.zip |
Cleanup generate_extras build/parse mess
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 0e83ea3b7e..664babd12e 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -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}" |