diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 23:37:28 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 23:37:28 +0000 |
| commit | 86543a70fb93069d2522dad00edf06c1ef2570de (patch) | |
| tree | f5e5805b5fb35ea5dbe2f074ee704623a11653b1 | |
| parent | 19e8b42a56536e0621097c337546557565579c57 (diff) | |
| download | rails-86543a70fb93069d2522dad00edf06c1ef2570de.tar.gz rails-86543a70fb93069d2522dad00edf06c1ef2570de.tar.bz2 rails-86543a70fb93069d2522dad00edf06c1ef2570de.zip | |
Fixed issues with caching root pages #734 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@867 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 7bd651cd48..ec3db05485 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed issues with caching root pages #734 [Nicholas Seckar] + * Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 [Jamis Buck] * Added shortcut :id assignment to render_component and friends (before you had to go through :params) #784 [Lucas Carlson] diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index e8200f6ded..46ef18c010 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -91,7 +91,7 @@ module ActionController #:nodoc: private def page_cache_file(path) name = ((path.empty? || path == "/") ? "/index" : path) - name << '.html' unless path.split('/').last.include? '.' + name << '.html' unless (name.split('/').last || name).include? '.' return name end |