From 72403003085ff6413ddf53e34561175e3dd68168 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Wed, 22 Jan 2014 09:28:19 -0500 Subject: put core at the beginning so other classes can modify the behavior --- activerecord/lib/active_record/timestamp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/timestamp.rb') diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index e0541b7681..09b37b7183 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -37,8 +37,8 @@ module ActiveRecord end def initialize_dup(other) # :nodoc: - clear_timestamp_attributes super + clear_timestamp_attributes end private -- cgit v1.2.3 From 8cbd500035aa64a5440d5ccc44209cfd902118fc Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Wed, 22 Jan 2014 12:55:46 -0500 Subject: Move changed_attributes into dirty.rb Move serialization dirty into serialization.rb --- activerecord/lib/active_record/timestamp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/timestamp.rb') diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index 09b37b7183..7178bed560 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -71,7 +71,7 @@ module ActiveRecord end def should_record_timestamps? - self.record_timestamps && (!partial_writes? || changed? || (attributes.keys & self.class.serialized_attributes.keys).present?) + self.record_timestamps && (!partial_writes? || changed?) end def timestamp_attributes_for_create_in_model -- cgit v1.2.3