aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-11-26 22:45:03 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-11-26 22:45:03 +0000
commit1370d1578727bdbfee06ccdf2109e8ca5649a652 (patch)
treea7a40ce54a1406dbed0f541b736d86264ee394a1
parent5e94f053cb52bac19bb0d5bb41bc52113c5a2078 (diff)
downloadrails-1370d1578727bdbfee06ccdf2109e8ca5649a652.tar.gz
rails-1370d1578727bdbfee06ccdf2109e8ca5649a652.tar.bz2
rails-1370d1578727bdbfee06ccdf2109e8ca5649a652.zip
Make the record_timestamps class-inheritable so it can be set per model. References #10004.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8217 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/timestamp.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 97132e3fdb..611c3d703e 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make the record_timestamps class-inheritable so it can be set per model. #10004 [tmacedo]
+
* Allow validates_acceptance_of to use a real attribute instead of only virtual (so you can record that the acceptance occured) #7457 [ambethia]
* DateTimes use Ruby's default calendar reform setting. #10201 [Geoff Buesing]
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index ee3e426512..84ae3785a2 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -12,7 +12,7 @@ module ActiveRecord
base.alias_method_chain :create, :timestamps
base.alias_method_chain :update, :timestamps
- base.cattr_accessor :record_timestamps, :instance_writer => false
+ base.class_inheritable_accessor :record_timestamps, :instance_writer => false
base.record_timestamps = true
end