From eecbd106a76469d99efc2166da9c306555006a35 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 13 Dec 2005 18:05:31 +0000 Subject: Don't used defined? on a scoped constant since it results in a const_missing call. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3298 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 1fb78d7e26..724c9cea0d 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -517,7 +517,7 @@ module ActionController #:nodoc: end end - if defined?(ActiveRecord::Observer) + if defined?(ActiveRecord) and defined?(ActiveRecord::Observer) class Sweeper < ActiveRecord::Observer #:nodoc: attr_accessor :controller -- cgit v1.2.3