diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-31 01:49:57 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-31 01:49:57 +0000 |
commit | 97019f9f5a94fa102debe13f5a957726e7d4783e (patch) | |
tree | 7887d896653681930192d6735712858a2ec903ea /activerecord/lib/active_record/timestamp.rb | |
parent | 3aaf60def848785a9c9c05c426359fa69888ef13 (diff) | |
download | rails-97019f9f5a94fa102debe13f5a957726e7d4783e.tar.gz rails-97019f9f5a94fa102debe13f5a957726e7d4783e.tar.bz2 rails-97019f9f5a94fa102debe13f5a957726e7d4783e.zip |
Partial updates play nice with updated_at/on timestamps
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
-rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index dc95d2aabb..a9e0efa6fe 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -30,7 +30,7 @@ module ActiveRecord end def update_with_timestamps(*args) #:nodoc: - if record_timestamps + if record_timestamps && (!partial_updates? || changed?) t = self.class.default_timezone == :utc ? Time.now.utc : Time.now write_attribute('updated_at', t) if respond_to?(:updated_at) write_attribute('updated_on', t) if respond_to?(:updated_on) |