diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-02 22:29:34 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-02 22:29:34 -0200 |
| commit | 6e55b32e98fcaad82184d2e21ee611a3465e4b20 (patch) | |
| tree | e316b8ca72f2bef50668c222400a159b36fbc090 /actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | |
| parent | c2e97cb410d759f383d29920165abdbf4b70e019 (diff) | |
| parent | 399909b11c094ab32542d300c72940b1b263b8e6 (diff) | |
| download | rails-6e55b32e98fcaad82184d2e21ee611a3465e4b20.tar.gz rails-6e55b32e98fcaad82184d2e21ee611a3465e4b20.tar.bz2 rails-6e55b32e98fcaad82184d2e21ee611a3465e4b20.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/deprecated_mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/deprecated_mapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb index dd76391870..8ce6b2f6d5 100644 --- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb +++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb @@ -113,7 +113,7 @@ module ActionDispatch end end - requirements[:controller] ||= Routing.controller_constraints + requirements[:controller] ||= @set.controller_constraints if defaults[:controller] defaults[:action] ||= 'index' @@ -175,7 +175,7 @@ module ActionDispatch optional = false elsif segment =~ /^:(\w+)$/ if defaults.has_key?($1.to_sym) - defaults.delete($1.to_sym) + defaults.delete($1.to_sym) if defaults[$1.to_sym].nil? else optional = false end |