diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-05 00:33:29 +0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-04-05 17:12:09 -0300 |
| commit | e9020b4b5dbd4a19e288c613a86c78e32010c361 (patch) | |
| tree | 21cfdc61c1db53243fafc69e0afeb06df5f1df62 /activesupport/lib/active_support/time_with_zone.rb | |
| parent | 1c4db4d7c34a1062e998bbdee03e992c4c5bff6d (diff) | |
| download | rails-e9020b4b5dbd4a19e288c613a86c78e32010c361.tar.gz rails-e9020b4b5dbd4a19e288c613a86c78e32010c361.tar.bz2 rails-e9020b4b5dbd4a19e288c613a86c78e32010c361.zip | |
added find_zone and find_zone! to AS timezones and changed the AS Railtie to use find_zone! as well as adding Railtie tests
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'activesupport/lib/active_support/time_with_zone.rb')
| -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 c66aa78ce8..d3937154f7 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -309,7 +309,7 @@ module ActiveSupport end def marshal_load(variables) - initialize(variables[0].utc, ::Time.__send__(:get_zone, variables[1]), variables[2].utc) + initialize(variables[0].utc, ::Time.find_zone(variables[1]), variables[2].utc) end # Ensure proxy class responds to all methods that underlying time instance responds to. |