aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-10-31 15:17:16 -0400
committerAaron Patterson <aaron.patterson@gmail.com>2011-10-31 15:17:16 -0400
commit62a86748ae8e6a43c20e917a963a614a02098a58 (patch)
treebf4577f62adef58d821a8592f5091ae605cf0686 /actionpack/lib/action_controller
parent6cbe4223a77d7ea364b4d2dc46cec6a0c58c9537 (diff)
downloadrails-62a86748ae8e6a43c20e917a963a614a02098a58.tar.gz
rails-62a86748ae8e6a43c20e917a963a614a02098a58.tar.bz2
rails-62a86748ae8e6a43c20e917a963a614a02098a58.zip
this should never return nil, so no use for "try"
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/caching/actions.rb2
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 f6b23e4efc..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.split('?').first.try(:ends_with?, ".#{extension}")
+ path << ".#{extension}" if extension and !path.split('?').first.ends_with?(".#{extension}")
URI.parser.unescape(path)
end
end