From 280c224b43f8a8d42ebfbe104e94d3895972856d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 15 Jun 2005 09:16:23 +0000 Subject: [PATCH] Reverted changeset #1326 coming off ticket #1230 since it caused stale caches to be shared.. nasty git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 53ec03a7a4..28c702e60f 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -180,16 +180,11 @@ def expire_action(options = {}) class ActionCacheFilter #:nodoc: def initialize(*actions) @actions = actions - @action_urls = {} - end - - def action_url(controller) - @action_urls[controller.action_name] ||= controller.url_for.split("://").last end def before(controller) return unless @actions.include?(controller.action_name.intern) - if cache = controller.read_fragment(action_url(controller)) + if cache = controller.read_fragment(controller.url_for.split("://").last) controller.rendered_action_cache = true controller.send(:render_text, cache) false @@ -198,7 +193,7 @@ def before(controller) def after(controller) return if !@actions.include?(controller.action_name.intern) || controller.rendered_action_cache - controller.write_fragment(action_url(controller), controller.response.body) + controller.write_fragment(controller.url_for.split("://").last, controller.response.body) end end end -- GitLab