diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-09-27 15:13:11 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-27 16:43:04 -0300 |
| commit | 2f326b7f27349b933fe617d83b3f80c6573ce5d8 (patch) | |
| tree | cea35ce13fe257fdad5c642681a2df0e4ffdcac2 /actionpack/lib/action_dispatch | |
| parent | 8be911c698aadd389b1607b4dbcea47001761536 (diff) | |
| download | rails-2f326b7f27349b933fe617d83b3f80c6573ce5d8.tar.gz rails-2f326b7f27349b933fe617d83b3f80c6573ce5d8.tar.bz2 rails-2f326b7f27349b933fe617d83b3f80c6573ce5d8.zip | |
Remove warning "URI.unescape is obsolete" from actionpack.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index a203ee5934..4289e78641 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -5,6 +5,8 @@ require 'active_support/core_ext/object/to_query' module ActionDispatch module Routing class RouteSet #:nodoc: + include ActionController::UriParser + PARAMETERS_KEY = 'action_dispatch.request.path_parameters' class Dispatcher #:nodoc: @@ -68,10 +70,6 @@ module ActionDispatch def split_glob_param!(params) params[@glob_param] = params[@glob_param].split('/').map { |v| uri_parser.unescape(v) } end - - def uri_parser - @uri_parser ||= URI.const_defined?(:Parser) ? URI::Parser.new : URI - end end # A NamedRouteCollection instance is a collection of named routes, and also |