From 3f0d4e7b1ba63390cac29c67b67572ef9ffdbf3c Mon Sep 17 00:00:00 2001 From: Pat Allan Date: Tue, 22 Dec 2009 09:49:42 +1100 Subject: [PATCH] Removing cache check - double-adding classes has no downside beyond a little extra time, and removes window for bugs/Rails version inconsistencies. --- lib/thinking_sphinx/context.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/thinking_sphinx/context.rb b/lib/thinking_sphinx/context.rb index 829b39dc0..5c16b7843 100644 --- a/lib/thinking_sphinx/context.rb +++ b/lib/thinking_sphinx/context.rb @@ -7,7 +7,7 @@ def initialize def prepare load_models - add_indexed_models if cached? + add_indexed_models end def define_indexes @@ -33,14 +33,6 @@ def superclass_indexed_models private - def cached? - return true if defined?(Merb) - - defined?(Rails) && - Rails::VERSION::STRING.to_f > 2.1 && - Rails.configuration.cache_classes - end - def add_indexed_models Object.subclasses_of(ActiveRecord::Base).each do |klass| add_indexed_model klass if klass.has_sphinx_indexes?