diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-07-05 15:06:09 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-07-05 15:06:09 +0000 |
| commit | 3b1d271e02e3f5b468b2a1ed3fc2a8bd2f228bd4 (patch) | |
| tree | bd828a6e46c74275f8ff8a24d26bbc0dddf62a29 /actionpack/lib/action_controller | |
| parent | 870cca6829cca8a2303bdcf2cbefde3c1ffbca5a (diff) | |
| download | rails-3b1d271e02e3f5b468b2a1ed3fc2a8bd2f228bd4.tar.gz rails-3b1d271e02e3f5b468b2a1ed3fc2a8bd2f228bd4.tar.bz2 rails-3b1d271e02e3f5b468b2a1ed3fc2a8bd2f228bd4.zip | |
Routing fix
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1712 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/routing.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index 7be27b2eea..64657a3821 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -118,8 +118,8 @@ module ActionController gp = g.dup # Use another generator to write the conditions after the first && # We do this to ensure that the generator will not assume x_value is set. It will # not be set if it follows a false condition -- for example, false && (x = 2) - - gp.after.map {|c| c.default_check gp} + + check += gp.after.map {|c| c.default_check gp} gp.if(check.join(' && ')) { gp.finish } # If this condition is met, we stop here true end |