diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-02 13:23:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-02 13:23:20 -0800 |
| commit | e5ee5a9d24f897bb8999bc6d3f47edc54917db99 (patch) | |
| tree | 707c21d3cce9e0a6250ab8d00bf39428942e841d /actionpack/lib/action_view | |
| parent | 2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69 (diff) | |
| parent | 204109eac9708d615bd88d60b0b7e5d265941423 (diff) | |
| download | rails-e5ee5a9d24f897bb8999bc6d3f47edc54917db99.tar.gz rails-e5ee5a9d24f897bb8999bc6d3f47edc54917db99.tar.bz2 rails-e5ee5a9d24f897bb8999bc6d3f47edc54917db99.zip | |
Merge branch '3-2-stable' into 3-2-secmerge
* 3-2-stable:
fix block.arity raise nil error when not given a block to "content_tag_for"
removes the Ajax on Rails early draft
Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present"
backport #8662, charset should not be appended for `head` responses
Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options."
Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.
backport #8616, quote column names in generated fixture files
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/record_tag_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb index aae6389445..709b5d2c17 100644 --- a/actionpack/lib/action_view/helpers/record_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb @@ -98,7 +98,9 @@ module ActionView options, prefix = prefix, nil if prefix.is_a?(Hash) options = options ? options.dup : {} options.merge!(:class => "#{dom_class(record, prefix)} #{options[:class]}".strip, :id => dom_id(record, prefix)) - if block.arity == 0 + if !block_given? + content_tag(tag_name, "", options) + elsif block.arity == 0 content_tag(tag_name, capture(&block), options) else content_tag(tag_name, capture(record, &block), options) |