r3465@asus: jeremy | 2005-12-13 10:15:33 -0800

Apply [3298] to stable. 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/branches/stable@3299 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Dec 13, 2005 · e8c7d7a · e8c7d7a
1 parent cad37c3
commit e8c7d7a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
@@ -514,8 +514,8 @@ def cache_sweeper(*sweepers)
         end
       end
     end
-    
-    if defined?(ActiveRecord::Observer)
+
+    if defined?(ActiveRecord) and defined?(ActiveRecord::Observer)
       class Sweeper < ActiveRecord::Observer #:nodoc:
         attr_accessor :controller