diff options
| author | Colin Curtin <colin@procore.com> | 2008-12-20 20:21:20 -0800 |
|---|---|---|
| committer | Colin Curtin <colin@procore.com> | 2008-12-20 20:21:20 -0800 |
| commit | 0e121f9ed93ebb417cc63307aaaf47f8adfd220d (patch) | |
| tree | 39530f289b38a5dd1b2e6b170dab2631c983aaf3 /actionpack/lib/action_controller/routing/recognition_optimisation.rb | |
| parent | b0187434bd7601a5b2e5f7afac99c964e566b9db (diff) | |
| parent | a0d091a41604d709cf2b99c85dcf4ae3ee275b9c (diff) | |
| download | rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.tar.gz rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.tar.bz2 rails-0e121f9ed93ebb417cc63307aaaf47f8adfd220d.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/routing/recognition_optimisation.rb')
| -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) |