From c62db052a0c188c405ad97abec9dd2cec2b9b1d8 Mon Sep 17 00:00:00 2001 From: Geoff Buesing Date: Fri, 28 Mar 2008 04:35:48 +0000 Subject: config.time_zone and TimeWithZone#marshal_load accept tzinfo/Olson identifiers git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9108 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/time_with_zone.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 6566c1c385..43b102db2e 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -206,7 +206,7 @@ module ActiveSupport end def marshal_load(variables) - initialize(variables[0], ::TimeZone[variables[1]], variables[2]) + initialize(variables[0], ::Time.send!(:get_zone, variables[1]), variables[2]) end # Ensure proxy class responds to all methods that underlying time instance responds to -- cgit v1.2.3