diff options
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 742491ae48..e7e5a7d71d 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -336,8 +336,8 @@ module ActiveRecord end_eval else association_finder = options[:conditions] ? - "#{association_class_name}.find_on_conditions(#{association_class_primary_key_name}, \"#{options[:conditions]}\")" : - "#{association_class_name}.find(#{association_class_primary_key_name})" + "#{association_class_name}.find_on_conditions(read_attribute(\"#{association_class_primary_key_name}\"), \"#{options[:conditions]}\")" : + "#{association_class_name}.find(read_attribute(\"#{association_class_primary_key_name}\"))" end has_association_method(association_name) |