diff options
| author | Marcel Molina <marcel@vernix.org> | 2005-10-12 22:57:04 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2005-10-12 22:57:04 +0000 |
| commit | d4576673c0c8d39f89e9798ab89b2c475a9f5f85 (patch) | |
| tree | 6c066a8ee96324a55377c2b9e5b43d4cdce19e75 | |
| parent | f49dc37e7100d8358d864a6e008c17acd24765fc (diff) | |
| download | rails-d4576673c0c8d39f89e9798ab89b2c475a9f5f85.tar.gz rails-d4576673c0c8d39f89e9798ab89b2c475a9f5f85.tar.bz2 rails-d4576673c0c8d39f89e9798ab89b2c475a9f5f85.zip | |
Unescape paths before writing cache to file system. Closes #1877.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2544 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 152c144a37..de55a929ad 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Unescape paths before writing cache to file system. #1877. [Damien Pollet] + * Wrap javascript_tag contents in a CDATA section and add a cdata_section method to TagHelper #1691 [Michael Schuerig, Sam Stephenson] * Misc doc fixes (typos/grammar/etc). #2445. [coffee2code] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 7afdef135d..2a9c388250 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -101,7 +101,7 @@ module ActionController #:nodoc: private def page_cache_file(path) - name = ((path.empty? || path == "/") ? "/index" : path) + name = ((path.empty? || path == "/") ? "/index" : URI.unescape(path)) name << page_cache_extension unless (name.split('/').last || name).include? '.' return name end |