aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/form_options_helper.rb
diff options
context:
space:
mode:
authorrick <technoweenie@gmail.com>2008-06-08 22:26:30 -0400
committerrick <technoweenie@gmail.com>2008-06-08 22:26:30 -0400
commit8bf74c30fe276606214850ae2de76fe0efb08d94 (patch)
tree860928709caf5c0d29fc76b4f0f24e50ca395a83 /actionpack/lib/action_view/helpers/form_options_helper.rb
parent51e4106dcc58e5218e8b297ad870a063b7bb1ab8 (diff)
downloadrails-8bf74c30fe276606214850ae2de76fe0efb08d94.tar.gz
rails-8bf74c30fe276606214850ae2de76fe0efb08d94.tar.bz2
rails-8bf74c30fe276606214850ae2de76fe0efb08d94.zip
change some more TimeZone references to ActiveSupport::TimeZone
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_options_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/form_options_helper.rb4
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..90bd99a861 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
)