diff options
Diffstat (limited to 'actionview/lib/action_view/helpers/tag_helper.rb')
| -rw-r--r-- | actionview/lib/action_view/helpers/tag_helper.rb | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/actionview/lib/action_view/helpers/tag_helper.rb b/actionview/lib/action_view/helpers/tag_helper.rb index 9b9ca7d60d..89a30d4b69 100644 --- a/actionview/lib/action_view/helpers/tag_helper.rb +++ b/actionview/lib/action_view/helpers/tag_helper.rb @@ -173,9 +173,21 @@ module ActionView end def tag_option(key, value, escape) - value = value.join(" ") if value.is_a?(Array) - value = ERB::Util.unwrapped_html_escape(value) if escape - %(#{key}="#{value}") + escaped_value = case value + when Array + if escape + safe_join(value, " ") + else + value.join(" ") + end + else + if escape + ERB::Util.unwrapped_html_escape(value) + else + value + end + end + %(#{key}="#{escaped_value}") end end end |