Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed that content_tag with a block will just return the result inste…

…ad of concate it if not used in a ERb view #7857, #7432 [michael.niessner]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6652 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit edaf6baea72c48dc90af3cb6b0a1078228f85f89 1 parent 0778464
@dhh dhh authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that content_tag with a block will just return the result instead of concate it if not used in a ERb view #7857, #7432 [michael.niessner]
+
* Replace the current block/continuation filter chain handling by an implementation based on a simple loop. #8226 [Stefan Kaes]
* Update UrlWriter to accept :anchor parameter. Closes #6771. [octopod]
View
7 actionpack/lib/action_view/helpers/tag_helper.rb
@@ -48,7 +48,8 @@ def content_tag(name, content_or_options_with_block = nil, options = nil, &block
if block_given?
options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
content = capture(&block)
- concat(content_tag_string(name, content, options), block.binding)
+ content_tag = content_tag_string(name, content, options)
+ block_is_within_action_view?(block) ? concat(content_tag, block.binding) : content_tag
else
content = content_or_options_with_block
content_tag_string(name, content, options)
@@ -98,6 +99,10 @@ def boolean_attribute(options, attribute)
def fix_double_escape(escaped)
escaped.gsub(/&([a-z]+|(#\d+));/i) { "&#{$1};" }
end
+
+ def block_is_within_action_view?(block)
+ eval("defined? _erbout", block.binding)
+ end
end
end
end
View
5 actionpack/test/template/tag_helper_test.rb
@@ -47,6 +47,11 @@ def test_content_tag_with_block_and_options
assert_dom_equal %(<div class="green">Hello world!</div>), _erbout
end
+ def test_content_tag_with_block_and_options_outside_of_action_view
+ assert_equal content_tag("a", "Create", :href => "create"),
+ content_tag("a", "href" => "create") { "Create" }
+ end
+
def test_cdata_section
assert_equal "<![CDATA[<hello world>]]>", cdata_section("<hello world>")
end
Please sign in to comment.
Something went wrong with that request. Please try again.