aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-30 15:29:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-30 15:29:27 +0000
commite6f3e5d90017f3f642dd2f4205679cc861a8a2ab (patch)
tree8522a30d273c2acd2ae640b2439f7f675661a69a /actionpack/lib/action_controller/caching.rb
parent787951348bd498ef16e0c2f24aa677499bc6b1ef (diff)
downloadrails-e6f3e5d90017f3f642dd2f4205679cc861a8a2ab.tar.gz
rails-e6f3e5d90017f3f642dd2f4205679cc861a8a2ab.tar.bz2
rails-e6f3e5d90017f3f642dd2f4205679cc861a8a2ab.zip
Fixed action/fragment caching using the filestore when a directory and a file wanted to to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1260 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 5ea5ab94ec..7c384738d6 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -375,7 +375,7 @@ module ActionController #:nodoc:
private
def real_file_path(name)
- '%s/%s' % [@cache_path, name.gsub('?', '.').gsub(':', '.')]
+ '%s/%s.cache' % [@cache_path, name.gsub('?', '.').gsub(':', '.')]
end
def ensure_cache_path(path)