can accept array for sql sanitizing in conditions

2010-05-25 14:01:53 +04:00
parent b473d8827f
commit 9c0346b90b
2 changed files with 17 additions and 1 deletions
--- a/lib/cancan/ability.rb
+++ b/lib/cancan/ability.rb
@@ -302,7 +302,8 @@ module CanCan
      can_definitions.each do |can_definition|
        merge_association_joins(joins, can_definition.association_joins || [])
      end
-      clear_association_joins(joins)
+      joins = clear_association_joins(joins)
+      joins unless joins.empty?
    end
    
    def merge_association_joins(what, with)