diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-19 14:10:42 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-19 14:10:42 +0000 |
| commit | 6c375d95054169e7fa02401a1838664e56a195ae (patch) | |
| tree | bb1ae42b6534fcecf71a4e992f516e7b4592fda4 /actionpack/lib/action_controller/routing | |
| parent | 46702e6a6d26b66b67076129fcf9c59c1c27bbeb (diff) | |
| parent | 89b75814045e811d52b19278ae27b5f45c6d9dd6 (diff) | |
| download | rails-6c375d95054169e7fa02401a1838664e56a195ae.tar.gz rails-6c375d95054169e7fa02401a1838664e56a195ae.tar.bz2 rails-6c375d95054169e7fa02401a1838664e56a195ae.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/recognition_optimisation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/recognition_optimisation.rb b/actionpack/lib/action_controller/routing/recognition_optimisation.rb index 3b98b16683..ebc553512f 100644 --- a/actionpack/lib/action_controller/routing/recognition_optimisation.rb +++ b/actionpack/lib/action_controller/routing/recognition_optimisation.rb @@ -56,7 +56,7 @@ module ActionController result = recognize_optimized(path, environment) and return result # Route was not recognized. Try to find out why (maybe wrong verb). - allows = HTTP_METHODS.select { |verb| routes.find { |r| r.recognize(path, :method => verb) } } + allows = HTTP_METHODS.select { |verb| routes.find { |r| r.recognize(path, environment.merge(:method => verb)) } } if environment[:method] && !HTTP_METHODS.include?(environment[:method]) raise NotImplemented.new(*allows) |