diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-10 12:14:44 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-10 12:14:44 -0800 |
| commit | 223a1d9451c88800e9fcc93a726fdebec99e2650 (patch) | |
| tree | 207b0b671778ac7a0e00829f6f642256b261cb28 /activerecord/lib/active_record/timestamp.rb | |
| parent | 13c6c3cfc59ff0b400b294dce15f32752b0fb5f5 (diff) | |
| parent | 9fe69b225cfbf12c02ee1433adf3a5aa17bcdf59 (diff) | |
| download | rails-223a1d9451c88800e9fcc93a726fdebec99e2650.tar.gz rails-223a1d9451c88800e9fcc93a726fdebec99e2650.tar.bz2 rails-223a1d9451c88800e9fcc93a726fdebec99e2650.zip | |
Merge branch 'master' into savepoints
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
| -rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb index a9e0efa6fe..8dbe80a01a 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -23,8 +23,8 @@ module ActiveRecord write_attribute('created_at', t) if respond_to?(:created_at) && created_at.nil? write_attribute('created_on', t) if respond_to?(:created_on) && created_on.nil? - write_attribute('updated_at', t) if respond_to?(:updated_at) - write_attribute('updated_on', t) if respond_to?(:updated_on) + write_attribute('updated_at', t) if respond_to?(:updated_at) && updated_at.nil? + write_attribute('updated_on', t) if respond_to?(:updated_on) && updated_on.nil? end create_without_timestamps end |