diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-03 09:09:59 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-03 09:09:59 -0800 |
| commit | cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4 (patch) | |
| tree | 409db16994e4a96c8ac08a04a0a37dd34df7c2cb /activerecord/lib/active_record/timestamp.rb | |
| parent | b4a23edc106f0c74aaa71fc605b76429064e3436 (diff) | |
| parent | d826f14443a8030068324b1fcab8dc0f1fc87c9d (diff) | |
| download | rails-cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4.tar.gz rails-cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4.tar.bz2 rails-cb2bd4aa619d9329c42aaf6d9f8eacc616ce53f4.zip | |
Merge pull request #8705 from amparo-luna/change_update_attributes_to_update
Rename update_attributes method to update
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 cf17b1d8a4..8ded6d4a86 100644 --- a/activerecord/lib/active_record/timestamp.rb +++ b/activerecord/lib/active_record/timestamp.rb @@ -43,7 +43,7 @@ module ActiveRecord private - def create + def create_record if self.record_timestamps current_time = current_time_from_proper_timezone @@ -57,7 +57,7 @@ module ActiveRecord super end - def update(*args) + def update_record(*args) if should_record_timestamps? current_time = current_time_from_proper_timezone |