aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-01 14:52:19 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-01 14:52:19 -0600
commit61a31f3d3dae55b3ed2a49fafcbfe45b77ea3be2 (patch)
tree1b361263eb8dcdeb9cb76740d4e63fadc88fcd1e /actionpack/lib/action_dispatch
parent6ac32a83283f46b55675ddf4ecab6c91f6f8abde (diff)
downloadrails-61a31f3d3dae55b3ed2a49fafcbfe45b77ea3be2.tar.gz
rails-61a31f3d3dae55b3ed2a49fafcbfe45b77ea3be2.tar.bz2
rails-61a31f3d3dae55b3ed2a49fafcbfe45b77ea3be2.zip
Fix generating params with optional defaults [#3404 state:resolved]
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/deprecated_mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
index dd76391870..87dfaba6c7 100644
--- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
@@ -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