diff options
| author | Scott Fleckenstein <nullstyle@gmail.com> | 2008-05-07 06:54:07 -0700 |
|---|---|---|
| committer | gbuesing <gbuesing@gmail.com> | 2008-05-08 19:25:31 -0500 |
| commit | eb5b93be74ed3eca925c1ab9bd4739919ae39a41 (patch) | |
| tree | 47e40b6cdb3a13911d2c3ff75761b4e7c1e9775a /activerecord/lib/active_record | |
| parent | bcb090c56b842a76397e0ea32f54c942fd11910e (diff) | |
| download | rails-eb5b93be74ed3eca925c1ab9bd4739919ae39a41.tar.gz rails-eb5b93be74ed3eca925c1ab9bd4739919ae39a41.tar.bz2 rails-eb5b93be74ed3eca925c1ab9bd4739919ae39a41.zip | |
Fix Time.zone.parse from stripping time zone information and make Time aware attribute methods use Time.zone.parse instead of to_time
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 46ecfc1969..973b761546 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -180,7 +180,7 @@ module ActiveRecord method_body = <<-EOV def #{attr_name}=(time) if time - time = time.to_time rescue time unless time.acts_like?(:time) + time = Time.zone.parse(time) rescue time unless time.acts_like?(:time) time = time.in_time_zone if time.acts_like?(:time) end write_attribute(:#{attr_name}, time) |