From 89e40987d8215516b97df31a551b2562d4e01493 Mon Sep 17 00:00:00 2001 From: Ryan Bates Date: Fri, 25 Mar 2011 14:26:33 -0700 Subject: [PATCH] make sure ActiveRecord::Relation is defined before checking conditions against it so Rails 2 is supported again - closes #312 --- lib/cancan/model_adapters/active_record_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cancan/model_adapters/active_record_adapter.rb b/lib/cancan/model_adapters/active_record_adapter.rb index 22fb669..4110847 100644 --- a/lib/cancan/model_adapters/active_record_adapter.rb +++ b/lib/cancan/model_adapters/active_record_adapter.rb @@ -99,7 +99,7 @@ module CanCan def override_scope conditions = @rules.map(&:conditions).compact - if conditions.any? { |c| c.kind_of?(ActiveRecord::Relation) } + if defined?(ActiveRecord::Relation) && conditions.any? { |c| c.kind_of?(ActiveRecord::Relation) } if conditions.size == 1 conditions.first else