Merge pull request #564 from flop/master

False positives on multiple nested abilities definitions
2012-05-10 10:59:08 -07:00
parent d1176245e6 ba01349eb0
commit b73bd062a8
2 changed files with 9 additions and 1 deletions
--- a/lib/cancan/rule.rb
+++ b/lib/cancan/rule.rb
@@ -123,7 +123,7 @@ module CanCan
    end

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