don't fail if association conditions aren't specified for nested association check

2010-09-03 11:05:58 -07:00
parent c88cb8f459
commit 1be5bf7a57
2 changed files with 2 additions and 1 deletions
--- a/lib/cancan/can_definition.rb
+++ b/lib/cancan/can_definition.rb
@@ -104,7 +104,7 @@ module CanCan

    def nested_subject_matches_conditions?(subject_hash)
      parent, child = subject_hash.shift
-      matches_conditions_hash?(parent, @conditions[parent.class.name.downcase.to_sym])
+      matches_conditions_hash?(parent, @conditions[parent.class.name.downcase.to_sym] || {})
    end

    def call_block_with_all(action, subject, extra_args)