diff options
author | Amparo Luna + Guillermo Iguaran <amparo.m.luna@gmail.com+guilleiguaran@gmail.com> | 2013-01-02 11:46:58 -0500 |
---|---|---|
committer | Amparo Luna + Guillermo Iguaran <amparo.m.luna@gmail.com+guilleiguaran@gmail.com> | 2013-01-03 11:51:21 -0500 |
commit | 1f3a1fedf951dbc4b72d178e2a649c4afd2f1566 (patch) | |
tree | 0bf671d26800e9e95128bb71672e6c52c248a488 /activerecord/lib/active_record/timestamp.rb | |
parent | 08db381d15ce37c54bd0f23a6a63eaeda1c1d6f3 (diff) | |
download | rails-1f3a1fedf951dbc4b72d178e2a649c4afd2f1566.tar.gz rails-1f3a1fedf951dbc4b72d178e2a649c4afd2f1566.tar.bz2 rails-1f3a1fedf951dbc4b72d178e2a649c4afd2f1566.zip |
Rename update_attributes method to update, keep update_attributes as an alias
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 |