diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-12 12:12:42 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-12 14:27:08 -0800 |
| commit | 49696e0a62f39648d82660c689d15e56bb5f5207 (patch) | |
| tree | d86337cf1553a612cc5467408fc367fbfce36da1 /activerecord/lib | |
| parent | 8bee98fe3a3917f86d53f68b7cc11c4aafe5f011 (diff) | |
| download | rails-49696e0a62f39648d82660c689d15e56bb5f5207.tar.gz rails-49696e0a62f39648d82660c689d15e56bb5f5207.tar.bz2 rails-49696e0a62f39648d82660c689d15e56bb5f5207.zip | |
@loaded is defined in initialize, so we should not need this
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index ba784fdb9d..c19ded242e 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -270,8 +270,6 @@ module ActiveRecord # ActiveRecord::RecordNotFound is rescued within the method, and it is # not reraised. The proxy is \reset and +nil+ is the return value. def load_target - return nil unless defined?(@loaded) - if !loaded? && (!@owner.new_record? || foreign_key_present?) && target_klass @target = find_target end |