diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-13 18:05:31 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-13 18:05:31 +0000 |
| commit | eecbd106a76469d99efc2166da9c306555006a35 (patch) | |
| tree | 954bf2f6bfff1442e26cab378256e9e43f06ac39 /actionpack/lib/action_controller/caching.rb | |
| parent | a5a54ae9e31e16b81d9ec4b8d20f3add73bb35c0 (diff) | |
| download | rails-eecbd106a76469d99efc2166da9c306555006a35.tar.gz rails-eecbd106a76469d99efc2166da9c306555006a35.tar.bz2 rails-eecbd106a76469d99efc2166da9c306555006a35.zip | |
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
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |