From 1a459e8e7d9f32e6c3a55153e8e1cfabef881839 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Mon, 20 Aug 2007 01:12:43 +0000 Subject: Fix bug where action caching sets the content type to the ActionCachePath object. Closes #9282 [mindforge] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7346 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 1b35cbe403..043b4ea761 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -231,7 +231,7 @@ module ActionController #:nodoc: cache_path = ActionCachePath.new(controller, path_options_for(controller, @options)) if cache = controller.read_fragment(cache_path.path) controller.rendered_action_cache = true - set_content_type!(controller, cache_path) + set_content_type!(controller, cache_path.extension) controller.send(:render_text, cache) false else -- cgit v1.2.3