diff options
| author | Ruy Asan <ruyasan@gmail.com> | 2008-06-10 21:13:27 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-11 00:49:13 -0700 |
| commit | 3f594299c85ef111ac479b845fa8c7e37563ff66 (patch) | |
| tree | d08164c273f787d9d2e5047ef951f1aae1ab2d05 /actionpack | |
| parent | 634e462a0b70ddae2f21dbddddd07e7b340bb69c (diff) | |
| download | rails-3f594299c85ef111ac479b845fa8c7e37563ff66.tar.gz rails-3f594299c85ef111ac479b845fa8c7e37563ff66.tar.bz2 rails-3f594299c85ef111ac479b845fa8c7e37563ff66.zip | |
TimeZone -> ActiveSupport::TimeZone. [#387 state:resolved]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index e0a097e367..b3f8e63c1b 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -304,7 +304,7 @@ module ActionView # # 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 @@ module ActionView 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 ) |