Skip to content
Browse files

Reverted changeset #1326 coming off ticket #1230 since it caused stal…

…e caches to be shared.. nasty

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent cb79118 commit 280c224b43f8a8d42ebfbe104e94d3895972856d @dhh dhh committed Jun 15, 2005
Showing with 2 additions and 7 deletions.
  1. +2 −7 actionpack/lib/action_controller/caching.rb
View
9 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

0 comments on commit 280c224

Please sign in to comment.
Something went wrong with that request. Please try again.