diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-23 20:43:06 +0000 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-23 20:43:06 +0000 |
| commit | e62de52aa398341a29b7ecef4ec9f9df8e1743e2 (patch) | |
| tree | 3a87677e000259ecc0ced6bc93afc03fea73493b /actionpack/lib/action_controller/caching | |
| parent | afd7140b66e7cb32e1be58d9e44489e6bcbde0dc (diff) | |
| parent | fd86a1b6b068df87164d5763bdcd4a323a1e76f4 (diff) | |
| download | rails-e62de52aa398341a29b7ecef4ec9f9df8e1743e2.tar.gz rails-e62de52aa398341a29b7ecef4ec9f9df8e1743e2.tar.bz2 rails-e62de52aa398341a29b7ecef4ec9f9df8e1743e2.zip | |
Merge branch 'master' into serializers
Diffstat (limited to 'actionpack/lib/action_controller/caching')
| -rw-r--r-- | actionpack/lib/action_controller/caching/actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb index 0031d2701f..f988de39dd 100644 --- a/actionpack/lib/action_controller/caching/actions.rb +++ b/actionpack/lib/action_controller/caching/actions.rb @@ -175,7 +175,7 @@ module ActionController #:nodoc: private def normalize!(path) path << 'index' if path[-1] == ?/ - path << ".#{extension}" if extension and !path.ends_with?(extension) + path << ".#{extension}" if extension and !path.split('?').first.ends_with?(".#{extension}") URI.parser.unescape(path) end end |