Merge pull request #655 from DavidMikeSimon/master

Fix for issue #560
2012-07-02 13:27:21 -07:00
parent 1e89b31bad b162871c6d
commit d20d90d2c2
2 changed files with 8 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