diff options
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency/join_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency/join_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb index becf1a3f62..7aaa24d767 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -146,7 +146,7 @@ module ActiveRecord private def interpolate(conditions) - if conditions.respond_to?(:to_proc) + if conditions.respond_to?(:to_proc) && !conditions.is_a?(Hash) instance_eval(&conditions) else conditions |