aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods.rb2
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)