diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-07-13 19:34:40 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-20 14:14:51 +0100 |
| commit | e1cfa6e0705f37b5f8cb885380f3a47405c24a9d (patch) | |
| tree | c861793bab863a5fd227c4b87a8a689dddec5bd6 /activerecord/lib/active_record | |
| parent | 7a271a8e844a4a5c931652a4a33a0d27445137c0 (diff) | |
| download | rails-e1cfa6e0705f37b5f8cb885380f3a47405c24a9d.tar.gz rails-e1cfa6e0705f37b5f8cb885380f3a47405c24a9d.tar.bz2 rails-e1cfa6e0705f37b5f8cb885380f3a47405c24a9d.zip | |
Convert association macros to the new syntax
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index e7fd72994f..fa77a8733b 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -93,7 +93,7 @@ module ActiveRecord end def reflection_scope - @reflection_scope ||= reflection.scope ? klass.unscoped.instance_exec(&reflection.scope) : klass.unscoped + @reflection_scope ||= reflection.scope ? klass.unscoped.instance_exec(nil, &reflection.scope) : klass.unscoped end def build_scope |