Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

change some more TimeZone references to ActiveSupport::TimeZone

  • Loading branch information...
commit 8bf74c30fe276606214850ae2de76fe0efb08d94 1 parent 51e4106
@technoweenie technoweenie authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_view/helpers/form_options_helper.rb
View
4 actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -304,7 +304,7 @@ def country_options_for_select(selected = nil, priority_countries = nil)
#
# NOTE: Only the option tags are returned, you have to wrap this call in
# a regular HTML select tag.
- def time_zone_options_for_select(selected = nil, priority_zones = nil, model = TimeZone)
+ def time_zone_options_for_select(selected = nil, priority_zones = nil, model = ActiveSupport::TimeZone)
zone_options = ""
zones = model.all
@@ -417,7 +417,7 @@ def to_time_zone_select_tag(priority_zones, options, html_options)
value = value(object)
content_tag("select",
add_options(
- time_zone_options_for_select(value || options[:default], priority_zones, options[:model] || TimeZone),
+ time_zone_options_for_select(value || options[:default], priority_zones, options[:model] || ActiveSupport::TimeZone),
options, value
), html_options
)
Please sign in to comment.
Something went wrong with that request. Please try again.