Merge pull request #8813 from greyblake/dont_write_timestamps_if_they_are_not_attributes

Write timestamps only if there are timestamps columns

Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 1 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index ddf3e1804c..5ef98ed820 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -47,7 +47,7 @@ module ActiveRecord
         current_time = current_time_from_proper_timezone
 
         all_timestamp_attributes.each do |column|
-          if respond_to?(column) && respond_to?("#{column}=") && self.send(column).nil?
+          if attributes.key?(column.to_s) && self.send(column).nil?
             write_attribute(column.to_s, current_time)
           end
         end