aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/association_collection.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-12-30 11:43:34 +0100
committerJosé Valim <jose.valim@gmail.com>2009-12-30 11:43:34 +0100
commit97a64b6b22d87cb6f89a224f7832433b86b545c0 (patch)
treec5e2e09316a8ae3f9317877d1e8f049a1cc0521f /activerecord/lib/active_record/associations/association_collection.rb
parente58ad8ed9cb0e67fde93c7edc8a0e13b8bc342ae (diff)
downloadrails-97a64b6b22d87cb6f89a224f7832433b86b545c0.tar.gz
rails-97a64b6b22d87cb6f89a224f7832433b86b545c0.tar.bz2
rails-97a64b6b22d87cb6f89a224f7832433b86b545c0.zip
Get rid of DeprecatedCallbacks in ActiveRecord::Associations and finally remove it.
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
-rw-r--r--activerecord/lib/active_record/associations/association_collection.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index b2b3a9789c..1ceb0dbf96 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -485,7 +485,14 @@ module ActiveRecord
def callback(method, record)
callbacks_for(method).each do |callback|
- ActiveSupport::DeprecatedCallbacks::Callback.new(method, callback, record).call(@owner, record)
+ case callback
+ when Symbol
+ @owner.send(callback, record)
+ when Proc
+ callback.call(@owner, record)
+ else
+ callback.send(method, @owner, record)
+ end
end
end