Merge branch 'master' into savepoints

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 1e0185d39c..aaa298dc49 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -200,7 +200,7 @@ module ActiveRecord
     end
 
     def save_with_transactions! #:nodoc:
-      rollback_active_record_state! { transaction { save_without_transactions! } }
+      rollback_active_record_state! { self.class.transaction { save_without_transactions! } }
     end
 
     # Reset id and @new_record if the transaction rolls back.
@@ -228,7 +228,7 @@ module ActiveRecord
     # instance.
     def with_transaction_returning_status(method, *args)
       status = nil
-      transaction do
+      self.class.transaction do
         status = send(method, *args)
         raise ActiveRecord::Rollback unless status
       end