diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2008-03-28 04:35:48 +0000 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2008-03-28 04:35:48 +0000 |
| commit | c62db052a0c188c405ad97abec9dd2cec2b9b1d8 (patch) | |
| tree | c71dbe96c414b17fb1a68e0951adc7bb3b0dbb59 /activesupport/lib | |
| parent | 59183eec6f8d3e5d1ac5046dbd4f5cefc7041256 (diff) | |
| download | rails-c62db052a0c188c405ad97abec9dd2cec2b9b1d8.tar.gz rails-c62db052a0c188c405ad97abec9dd2cec2b9b1d8.tar.bz2 rails-c62db052a0c188c405ad97abec9dd2cec2b9b1d8.zip | |
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
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |