diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-11-23 19:44:43 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-11-23 19:44:43 -0600 |
| commit | 8d351eac078642505057351e7113100550ed8bc7 (patch) | |
| tree | f069fc2edb293c3f2c2e16882fb45d0c0bab8957 /actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | |
| parent | 53d7acdf4f3d61865fb4c4baa6f23601a93e3630 (diff) | |
| download | rails-8d351eac078642505057351e7113100550ed8bc7.tar.gz rails-8d351eac078642505057351e7113100550ed8bc7.tar.bz2 rails-8d351eac078642505057351e7113100550ed8bc7.zip | |
Extract Routing.controller_constraints
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 0564ba9797..dd76391870 100644 --- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb +++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb @@ -113,8 +113,7 @@ module ActionDispatch end end - possible_names = Routing.possible_controllers.collect { |n| Regexp.escape(n) } - requirements[:controller] ||= Regexp.union(*possible_names) + requirements[:controller] ||= Routing.controller_constraints if defaults[:controller] defaults[:action] ||= 'index' |