diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-27 17:02:09 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-27 17:02:09 +0000 |
commit | 6ef19fcd48bef1b70ae1b8a39da1fa9baae088cf (patch) | |
tree | ebc0b0a200fdab45453f067091c0adf1fa21b7c6 | |
parent | 6f5a7b200443baf209d2f33c428ed4a4059782f7 (diff) | |
download | rails-6ef19fcd48bef1b70ae1b8a39da1fa9baae088cf.tar.gz rails-6ef19fcd48bef1b70ae1b8a39da1fa9baae088cf.tar.bz2 rails-6ef19fcd48bef1b70ae1b8a39da1fa9baae088cf.zip |
Fixed that caching the root would result in .html not index.html
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@801 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-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 cb6f934860..2e47b00188 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Fixed that caching the root would result in .html not index.html + + *1.5.0* (24th February, 2005) * Added Routing as a replacement for mod_rewrite pretty urls [Nicholas Seckar]. Read more in ActionController::Base.url_for and on http://manuals.rubyonrails.com/read/book/9 diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index c51e0f4d70..cde5b4f1e9 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -90,7 +90,7 @@ module ActionController #:nodoc: private def page_cache_file(path) - (path.empty? ? "/index" : path) + ".html" + ((path.empty? || path == "/") ? "/index" : path) + ".html" end def page_cache_path(path) |