Merge remote branch 'martingordon/patch-1'

steveklabnik · Sep 3, 2011 · c1176c8 · c1176c8
2 parents 8888dc9 + eb66e93
commit c1176c8
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lib/thinking_sphinx/context.rb b/lib/thinking_sphinx/context.rb
@@ -62,11 +62,7 @@ def load_models
 
         begin
           camelized_model.constantize
-        rescue LoadError
-          model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
-        rescue NameError
-          next
-        rescue StandardError => err
+        rescue Error => err
           STDERR.puts "Warning: Error loading #{file}:"
           STDERR.puts err.message
           STDERR.puts err.backtrace.join("\n"), ''