From 3010e30f0ed9407e3d608e8bb4859f09cb52c14e Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Sat, 30 Sep 2006 01:38:22 +0000 Subject: Fixed some deprecation warnings in ActionPack [Rick Olson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'actionpack/lib/action_controller/caching.rb') diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index e7782d3e22..fa45b46e05 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -135,7 +135,7 @@ module ActionController #:nodoc: private def caching_allowed - !@request.post? && response.headers['Status'] && response.headers['Status'].to_i < 400 + !request.post? && response.headers['Status'] && response.headers['Status'].to_i < 400 end end @@ -559,8 +559,7 @@ module ActionController #:nodoc: return unless perform_caching configuration = sweepers.last.is_a?(Hash) ? sweepers.pop : {} sweepers.each do |sweeper| - observer(sweeper) - + ActiveRecord::Base.observers << sweeper if defined?(ActiveRecord) and defined?(ActiveRecord::Base) sweeper_instance = Object.const_get(Inflector.classify(sweeper)).instance if sweeper_instance.is_a?(Sweeper) -- cgit v1.2.3