diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-10-24 18:08:54 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-10-24 18:08:54 -0500 |
| commit | a840c8afbf4e30b7bd9979e8cd70192c65be7a43 (patch) | |
| tree | 82ca10172b498a604c051576f51e113eefe9a574 /actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | |
| parent | a0049a6b429c6de46537cc31bf7b3ca48b4c1b2c (diff) | |
| download | rails-a840c8afbf4e30b7bd9979e8cd70192c65be7a43.tar.gz rails-a840c8afbf4e30b7bd9979e8cd70192c65be7a43.tar.bz2 rails-a840c8afbf4e30b7bd9979e8cd70192c65be7a43.zip | |
Restore `rake routes` [#3402 state:resolved]
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/deprecated_mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb index f2a1f10fa7..0564ba9797 100644 --- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb +++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb @@ -132,7 +132,6 @@ module ActionDispatch path = optionalize_trailing_dynamic_segments(path, requirements, defaults) glob = $1.to_sym if path =~ /\/\*(\w+)$/ path = ::Rack::Mount::Utils.normalize_path(path) - path = ::Rack::Mount::Strexp.compile(path, requirements, %w( / . ? )) if glob && !defaults[glob].blank? raise ActionController::RoutingError, "paths cannot have non-empty default values" @@ -145,7 +144,7 @@ module ActionDispatch conditions[:request_method] = method if method conditions[:path_info] = path if path - @set.add_route(app, conditions, defaults, name) + @set.add_route(app, conditions, requirements, defaults, name) end def optionalize_trailing_dynamic_segments(path, requirements, defaults) #:nodoc: |