aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2013-11-14 15:31:27 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2013-11-14 15:31:27 -0800
commit07996ebc50f5906dbecc481ac83ed2adefc9ec6e (patch)
treea6275a518624722710cae2aa29ae18d5b4204cc9 /actionview
parent421c81bd1875eb4e163bea8ce18b1ae9c2224e7d (diff)
downloadrails-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 'actionview')
-rw-r--r--actionview/lib/action_view/helpers/atom_feed_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/atom_feed_helper.rb b/actionview/lib/action_view/helpers/atom_feed_helper.rb
index 1df52cd4b5..af70a4242a 100644
--- a/actionview/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionview/lib/action_view/helpers/atom_feed_helper.rb
@@ -135,11 +135,11 @@ module ActionView
# Delegate to xml builder, first wrapping the element in a xhtml
# namespaced div element if the method and arguments indicate
# that an xhtml_block? is desired.
- def method_missing(method, *arguments)
+ def method_missing(method, *arguments, &block)
if xhtml_block?(method, arguments)
@xml.__send__(method, *arguments) do
@xml.div(:xmlns => 'http://www.w3.org/1999/xhtml') do |xhtml|
- yield(xhtml)
+ block.call(xhtml)
end
end
else