diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-12 19:58:54 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-12 19:58:54 -0600 |
commit | 8a50f8a545ebde9cbae4187d1b1d5a59a29711f3 (patch) | |
tree | 9cb1cabd8fa056e6a41a93913dab66231a1fc442 /activerecord/lib | |
parent | 39b708be96f470555bdc6d2c81f252f9f175f899 (diff) | |
download | rails-8a50f8a545ebde9cbae4187d1b1d5a59a29711f3.tar.gz rails-8a50f8a545ebde9cbae4187d1b1d5a59a29711f3.tar.bz2 rails-8a50f8a545ebde9cbae4187d1b1d5a59a29711f3.zip |
Revert "Fix instance_eval calls to association proxies"
I think it may of broke the build. Lets see.
This reverts commit 49e943c4f0ac3459bd53023167aaa08fc8e46733.
Conflicts:
activerecord/test/cases/associations/has_many_associations_test.rb
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 6ad1e06300..7d8f4670fa 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -200,14 +200,18 @@ module ActiveRecord private # Forwards any missing method call to the \target. - def method_missing(method, *args, &block) + def method_missing(method, *args) if load_target unless @target.respond_to?(method) message = "undefined method `#{method.to_s}' for \"#{@target}\":#{@target.class.to_s}" raise NoMethodError, message end - @target.send(method, *args, &block) + if block_given? + @target.send(method, *args) { |*block_args| yield(*block_args) } + else + @target.send(method, *args) + end end end |