aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-03-14 16:17:05 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-03-14 16:17:05 -0700
commit9ba2d422f58e17b9e3d2a91d9979017aa36d13bd (patch)
tree07892f2a25003e14e94f10a17de1c76a22e5cc9e /actionpack
parent833a90594e9fe25819c5111c853adc91eb6071c2 (diff)
downloadrails-9ba2d422f58e17b9e3d2a91d9979017aa36d13bd.tar.gz
rails-9ba2d422f58e17b9e3d2a91d9979017aa36d13bd.tar.bz2
rails-9ba2d422f58e17b9e3d2a91d9979017aa36d13bd.zip
stop splatting arguments so that we can understand wtf is going on
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index f67708722b..e7b267da81 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -365,8 +365,9 @@ module ActionDispatch
#
# See <tt>Scoping#defaults</tt> for its scope equivalent.
def match(path, options=nil)
- mapping = Mapping.new(@set, @scope, path, options || {}).to_route
- @set.add_route(*mapping)
+ mapping = Mapping.new(@set, @scope, path, options || {})
+ app, conditions, requirements, defaults, as, anchor = mapping.to_route
+ @set.add_route(app, conditions, requirements, defaults, as, anchor)
self
end