diff options
| author | rick <technoweenie@gmail.com> | 2008-07-07 22:24:18 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-07-07 22:24:18 -0700 |
| commit | a14cedc7797aef4ccd9da46ed73e36d730392814 (patch) | |
| tree | e872dd40371df990b462c4eab18abac08bb86a01 /actionpack/lib/action_controller/caching | |
| parent | e939f60b6cac13219b927f13165e4fbd85445254 (diff) | |
| parent | 2f4aaed7b3feb3be787a316fab3144c06bb21a27 (diff) | |
| download | rails-a14cedc7797aef4ccd9da46ed73e36d730392814.tar.gz rails-a14cedc7797aef4ccd9da46ed73e36d730392814.tar.bz2 rails-a14cedc7797aef4ccd9da46ed73e36d730392814.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 234ef8ae5b..f3535f8330 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -166,10 +166,7 @@ module ActionController #:nodoc: # If there's no extension in the path, check request.format if extension.nil? - extension = request.format.to_sym.to_s - if extension=='all' - extension = nil - end + extension = request.cache_format end extension end |