Fix for issue 560 where joins could be thrown away by ActiveRecordAdapter::merge_joins

2012-06-18 19:40:48 -07:00 · 2012-06-18 19:40:48 -07:00 · cfc355c006
commit cfc355c006
parent 7bf683d8f4
1 changed files with 2 additions and 2 deletions
--- a/lib/cancan/model_adapters/active_record_adapter.rb
+++ b/lib/cancan/model_adapters/active_record_adapter.rb
@ -145,8 +145,8 @@ module CanCan
      # 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