From 608bf7b72c227a3030db9418217d9a77325c2b21 Mon Sep 17 00:00:00 2001 From: Krekoten' Marjan Date: Mon, 18 Oct 2010 21:04:44 +0300 Subject: [PATCH] AC::Caching DRYup Remove ActionController::Caching::Pages#caching_allowed because it duplicates ActionController::Caching#caching_allowed? Signed-off-by: Santiago Pastorino --- actionpack/lib/action_controller/caching/pages.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb index df4d500069..104157d0b1 100644 --- a/actionpack/lib/action_controller/caching/pages.rb +++ b/actionpack/lib/action_controller/caching/pages.rb @@ -134,7 +134,7 @@ module ActionController #:nodoc: # If no options are provided, the requested url is used. Example: # cache_page "I'm the cached content", :controller => "lists", :action => "show" def cache_page(content = nil, options = nil) - return unless self.class.perform_caching && caching_allowed + return unless self.class.perform_caching && caching_allowed? path = case options when Hash @@ -148,10 +148,6 @@ module ActionController #:nodoc: self.class.cache_page(content || response.body, path) end - private - def caching_allowed - request.get? && response.status.to_i == 200 - end end end end