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

1 files 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 @@ module ActionController #:nodoc:
       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 @@ module ActionController #:nodoc:
         
         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