Fix for issue 560 where joins could be thrown away by ActiveRecordAda…

…pter::merge_joins
dszczyt · Jun 19, 2012 · cfc355c · cfc355c
1 parent 7bf683d
commit cfc355c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/cancan/model_adapters/active_record_adapter.rb b/lib/cancan/model_adapters/active_record_adapter.rb
@@ -145,8 +145,8 @@ def sanitize_sql(conditions)
       # Takes two hashes and does a deep merge.
       def merge_joins(base, add)
         add.each do |name, nested|
-          if base[name].is_a?(Hash) && !nested.empty?
-            merge_joins(base[name], nested)
+          if base[name].is_a?(Hash)
+            merge_joins(base[name], nested) unless nested.empty?
           else
             base[name] = nested
           end