allow query.conditions to be called multiple times without losing conditions

2010-12-21 14:01:28 -08:00
parent 9b8e84944c
commit 5e1e6e182b
2 changed files with 11 additions and 2 deletions
--- a/lib/cancan/query.rb
+++ b/lib/cancan/query.rb
@@ -26,10 +26,10 @@ module CanCan
    def conditions
      if @rules.size == 1 && @rules.first.base_behavior
        # Return the conditions directly if there's just one definition
-        @rules.first.tableized_conditions
+        @rules.first.tableized_conditions.dup
      else
        @rules.reverse.inject(false_sql) do |sql, rule|
-          merge_conditions(sql, rule.tableized_conditions, rule.base_behavior)
+          merge_conditions(sql, rule.tableized_conditions.dup, rule.base_behavior)
        end
      end
    end