diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-27 21:52:48 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-27 21:52:48 +0000 |
| commit | 439a216dcb65ac83d86ca04bb898e1797a87ce70 (patch) | |
| tree | fc6ae8e7d7429c418298dc610a9af76ac1618526 /actionpack | |
| parent | b7c7b35b07c3739bafd808d0324eaa0c200f1aea (diff) | |
| download | rails-439a216dcb65ac83d86ca04bb898e1797a87ce70.tar.gz rails-439a216dcb65ac83d86ca04bb898e1797a87ce70.tar.bz2 rails-439a216dcb65ac83d86ca04bb898e1797a87ce70.zip | |
Fixed problem with page caching #958 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1029 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index b921ab034f..070a8b8503 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Fixed problem with page caching #958 [Rick Olson] + + *1.7.0* (27th March, 2005) * Added ActionController::Base.page_cache_extension for setting the page cache file extension (the default is .html) #903 [Andreas] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index beac97f1ca..ec30973696 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -99,7 +99,7 @@ module ActionController #:nodoc: private def page_cache_file(path) name = ((path.empty? || path == "/") ? "/index" : path) - name << @@page_cache_extension unless (name.split('/').last || name).include? '.' + name << page_cache_extension unless (name.split('/').last || name).include? '.' return name end |