aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAlex Robbin <alex.robbin@meyouhealth.com>2014-12-13 15:46:52 -0500
committerAlex Robbin <alex.robbin@meyouhealth.com>2014-12-13 15:52:41 -0500
commita842c5c12d4c1091c4e065cbdbc3adb58ce55bc9 (patch)
tree2e4116006311a45843af1c05ce3bce6031d3dd79 /actionpack/lib/action_dispatch
parent4c2aaca4dfd01223f6190c45f6582867dd84d6b4 (diff)
downloadrails-a842c5c12d4c1091c4e065cbdbc3adb58ce55bc9.tar.gz
rails-a842c5c12d4c1091c4e065cbdbc3adb58ce55bc9.tar.bz2
rails-a842c5c12d4c1091c4e065cbdbc3adb58ce55bc9.zip
allow URL helpers to work with optional scopes
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 34cd06fd58..d7693bdcee 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -293,7 +293,7 @@ module ActionDispatch
path_params -= result.keys
end
path_params.each { |param|
- result[param] = inner_options[param] || args.shift
+ result[param] = inner_options.fetch(param) { args.shift }
}
end