diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-07 16:10:20 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-07 16:10:20 -0700 |
| commit | 089661b69ad055cab68ea860c085c7f852da3972 (patch) | |
| tree | a39fe35f3c399b199bdca8490724b451761a1cba /actionview/lib/action_view/helpers/tags/select.rb | |
| parent | cc1de71bfaced172fe00a66fd381da69d9528e8b (diff) | |
| parent | e81453ef92b37156dafc092093106c8e8b87b268 (diff) | |
| download | rails-089661b69ad055cab68ea860c085c7f852da3972.tar.gz rails-089661b69ad055cab68ea860c085c7f852da3972.tar.bz2 rails-089661b69ad055cab68ea860c085c7f852da3972.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionview/lib/action_view/helpers/tags/select.rb')
| -rw-r--r-- | actionview/lib/action_view/helpers/tags/select.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/tags/select.rb b/actionview/lib/action_view/helpers/tags/select.rb index 00881d9978..180900cc8d 100644 --- a/actionview/lib/action_view/helpers/tags/select.rb +++ b/actionview/lib/action_view/helpers/tags/select.rb @@ -3,7 +3,7 @@ module ActionView module Tags # :nodoc: class Select < Base # :nodoc: def initialize(object_name, method_name, template_object, choices, options, html_options) - @choices = block_given? ? template_object.capture { yield } : choices + @choices = block_given? ? template_object.capture { yield || "" } : choices @choices = @choices.to_a if @choices.is_a?(Range) @html_options = html_options |