diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-10-13 15:06:43 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-10-13 15:06:43 -0300 |
commit | 991d1bc200d6fdc379bc83610bc92a4e220c669e (patch) | |
tree | 84ace4c9c117ba7bc82824dbddf15485a9305bd2 /activerecord/lib/active_record/associations | |
parent | 0cf4662ec589813c4fdc22de3398730cab05c5ed (diff) | |
parent | 9cd50e7752650a3d6bf8545b51d50619d6e70c0b (diff) | |
download | rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.tar.gz rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.tar.bz2 rails-991d1bc200d6fdc379bc83610bc92a4e220c669e.zip |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 1b7bf42b91..25e329c0c1 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -476,7 +476,7 @@ module ActiveRecord def callback(method, record) callbacks_for(method).each do |callback| - ActiveSupport::Callbacks::Callback.new(method, callback, record).call(@owner, record) + ActiveSupport::DeprecatedCallbacks::Callback.new(method, callback, record).call(@owner, record) end end |