diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2013-11-14 15:31:27 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2013-11-14 15:31:27 -0800 |
| commit | 07996ebc50f5906dbecc481ac83ed2adefc9ec6e (patch) | |
| tree | a6275a518624722710cae2aa29ae18d5b4204cc9 /actionpack | |
| parent | 421c81bd1875eb4e163bea8ce18b1ae9c2224e7d (diff) | |
| download | rails-07996ebc50f5906dbecc481ac83ed2adefc9ec6e.tar.gz rails-07996ebc50f5906dbecc481ac83ed2adefc9ec6e.tar.bz2 rails-07996ebc50f5906dbecc481ac83ed2adefc9ec6e.zip | |
Revert "Used Yield instead of block.call" -- this causes all of atom_feed_helper_test.rb to fail with "SystemStackError: stack level too deep".
This reverts commit d3a1ce1cdc60d593de1682c5f4e3230c8db9a0fd.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index bcd21dbabc..84ade41036 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -358,10 +358,10 @@ module ActionController #:nodoc: # # Sends :not_acceptable to the client and returns nil if no suitable format # is available. - def retrieve_collector_from_mimes(mimes = nil) #:nodoc: + def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc: mimes ||= collect_mimes_from_class_level collector = Collector.new(mimes) - yield(collector) if block_given? + block.call(collector) if block_given? format = collector.negotiate_format(request) if format |