diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-25 17:12:19 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-25 17:12:19 -0700 |
commit | 89397d09ebb7ca4089f17820d05d5eb223913652 (patch) | |
tree | a3836aedbeba1670571ebe6cbc14b79c921c0068 /activerecord/lib/active_record/transactions.rb | |
parent | 450743cf56125d153b64c3509e75b0e4f86851d1 (diff) | |
download | rails-89397d09ebb7ca4089f17820d05d5eb223913652.tar.gz rails-89397d09ebb7ca4089f17820d05d5eb223913652.tar.bz2 rails-89397d09ebb7ca4089f17820d05d5eb223913652.zip |
Prefix internal method with _
This will avoid naming clash with user defined methods
Diffstat (limited to 'activerecord/lib/active_record/transactions.rb')
-rw-r--r-- | activerecord/lib/active_record/transactions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index bb06d0304b..f92e1de03b 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -309,7 +309,7 @@ module ActiveRecord # Ensure that it is not called if the object was never persisted (failed create), # but call it after the commit of a destroyed object. def committed!(should_run_callbacks = true) #:nodoc: - run_commit_callbacks if should_run_callbacks && destroyed? || persisted? + _run_commit_callbacks if should_run_callbacks && destroyed? || persisted? ensure force_clear_transaction_record_state end @@ -317,7 +317,7 @@ module ActiveRecord # Call the +after_rollback+ callbacks. The +force_restore_state+ argument indicates if the record # state should be rolled back to the beginning or just to the last savepoint. def rolledback!(force_restore_state = false, should_run_callbacks = true) #:nodoc: - run_rollback_callbacks if should_run_callbacks + _run_rollback_callbacks if should_run_callbacks ensure restore_transaction_record_state(force_restore_state) clear_transaction_record_state |