diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-14 12:34:38 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-14 12:34:38 -0300 |
| commit | 48c1e6d584409d774b184e0f4d2ef28e5b0e9c90 (patch) | |
| tree | a2becf0cce37a47579e848780b02f420d335ccd9 /actionpack/lib/action_controller/metal/mime_responds.rb | |
| parent | 9ac01fad193b27e517ea772e0d1e13e06f4ddf34 (diff) | |
| parent | c6bc8e662614be711f45a8d4b231d5f993b024a7 (diff) | |
| download | rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.tar.gz rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.tar.bz2 rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/metal/mime_responds.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index c8d042acb5..950105e63f 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -226,10 +226,11 @@ module ActionController #:nodoc: # is quite simple (it just needs to respond to call), you can even give # a proc to it. # - def respond_with(resource, options={}, &block) + def respond_with(*resources, &block) respond_to(&block) rescue ActionView::MissingTemplate - (options.delete(:responder) || responder).call(self, resource, options) + options = resources.extract_options! + (options.delete(:responder) || responder).call(self, resources, options) end def responder |