diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-02 04:05:05 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-02 04:05:05 -0800 |
| commit | 204109eac9708d615bd88d60b0b7e5d265941423 (patch) | |
| tree | 408f5745eb670b9b24c671ab8a25be2b58579b7e /actionpack/lib/action_view/helpers/record_tag_helper.rb | |
| parent | b366ec51efa14341cb568790c42b8c273d4f4d90 (diff) | |
| parent | ea881ca85a1a9df3c25e2ee8668d98416a5c1acb (diff) | |
| download | rails-204109eac9708d615bd88d60b0b7e5d265941423.tar.gz rails-204109eac9708d615bd88d60b0b7e5d265941423.tar.bz2 rails-204109eac9708d615bd88d60b0b7e5d265941423.zip | |
Merge pull request #8640 from jasl/3-2-stable
fix block.arity will raise nil error
Diffstat (limited to 'actionpack/lib/action_view/helpers/record_tag_helper.rb')
| -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) |