From 4dc42f53539a5d1020c49dd61bad2276adc277bf Mon Sep 17 00:00:00 2001 From: Dave Rogers Date: Sun, 24 Jul 2011 17:21:26 -0700 Subject: Ensure the constraints block is only applied to the correct route addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints. --- actionpack/lib/action_dispatch/routing/mapper.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_dispatch/routing') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 8d071b2061..1331f67a78 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -190,13 +190,12 @@ module ActionDispatch end def blocks - block = @scope[:blocks] || [] - - if @options[:constraints].present? && !@options[:constraints].is_a?(Hash) - block << @options[:constraints] + constraints = @options[:constraints] + if constraints.present? && !constraints.is_a?(Hash) + [constraints] + else + @scope[:blocks] || [] end - - block end def constraints -- cgit v1.2.3