Skip to content
Browse files

Making time_zone_options_for_select return a html_safe string master …

…backport
  • Loading branch information...
1 parent b154b97 commit 43e2bbe28e91711c34e38b4ca77023ac9d652936 @spastorino spastorino committed Aug 15, 2010
View
2 actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -481,7 +481,7 @@ def time_zone_options_for_select(selected = nil, priority_zones = nil, model = :
end
zone_options += options_for_select(convert_zones[zones], selected)
- zone_options
+ zone_options.html_safe
end
private
View
4 actionpack/test/template/form_options_helper_test.rb
@@ -280,6 +280,10 @@ def test_time_zone_options_with_unselected_priority_zones
opts
end
+ def test_time_zone_options_returns_html_safe_string
+ assert time_zone_options_for_select.html_safe?
+ end
+
def test_select
@post = Post.new
@post.category = "<mus>"

0 comments on commit 43e2bbe

Please sign in to comment.
Something went wrong with that request. Please try again.