diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-02-01 15:15:29 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-02-01 23:19:25 +0000 |
| commit | 42dab646eb10e8c7249ad875465679eaf9acc856 (patch) | |
| tree | 1068fa484e5b6e161bc0b4243c3056c58dcf5d05 /activerecord/lib | |
| parent | 780bf52085bf64f4d55b5e992fce3474f8f7ad70 (diff) | |
| download | rails-42dab646eb10e8c7249ad875465679eaf9acc856.tar.gz rails-42dab646eb10e8c7249ad875465679eaf9acc856.tar.bz2 rails-42dab646eb10e8c7249ad875465679eaf9acc856.zip | |
Merge pull request #4543 from jdelStrother/find_or_init
Don't instantiate two objects in collection proxy / find_or_instantiate_by
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_proxy.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index eb320bc774..416a5823c6 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -82,9 +82,8 @@ module ActiveRecord proxy_association.send :add_to_target, r yield(r) if block_given? end - end - if target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method)) + elsif target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method)) if load_target if target.respond_to?(method) target.send(method, *args, &block) |