diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-10 12:14:44 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-10 12:14:44 -0800 |
| commit | 223a1d9451c88800e9fcc93a726fdebec99e2650 (patch) | |
| tree | 207b0b671778ac7a0e00829f6f642256b261cb28 /actionpack/lib/action_controller/routing/recognition_optimisation.rb | |
| parent | 13c6c3cfc59ff0b400b294dce15f32752b0fb5f5 (diff) | |
| parent | 9fe69b225cfbf12c02ee1433adf3a5aa17bcdf59 (diff) | |
| download | rails-223a1d9451c88800e9fcc93a726fdebec99e2650.tar.gz rails-223a1d9451c88800e9fcc93a726fdebec99e2650.tar.bz2 rails-223a1d9451c88800e9fcc93a726fdebec99e2650.zip | |
Merge branch 'master' into savepoints
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) |