Skip to content

Commit

Permalink
TimeZone -> ActiveSupport::TimeZone. [#387 state:resolved]
Browse files Browse the repository at this point in the history
  • Loading branch information
clarabstract authored and jeremy committed Jun 11, 2008
1 parent a797375 commit 011b5ed
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions actionpack/lib/action_view/helpers/form_options_helper.rb
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand Down

0 comments on commit 011b5ed

Please sign in to comment.