@@ -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 ) actionpack/lib/action_view/helpers/form_options_helper.rb 634e462a0b70ddae2f21dbddddd07e7b340bb69c Ruy Asan ruyasan@gmail.com http://github.com/rails/rails/commit/3f594299c85ef111ac479b845fa8c7e37563ff66 3f594299c85ef111ac479b845fa8c7e37563ff66 2008-06-11T00:49:13-07:00 2008-06-10T21:13:27-07:00 TimeZone -> ActiveSupport::TimeZone. [#387 state:resolved] d08164c273f787d9d2e5047ef951f1aae1ab2d05 Jeremy Kemper jeremy@bitsweat.net