aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching/actions.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-12-26 17:18:06 +0000
committerPratik Naik <pratiknaik@gmail.com>2008-12-26 17:18:06 +0000
commit73e9f4e9096515e9f4d97baaa914320c42159985 (patch)
treedb8fc9b9c07ca9a523a764ad76ce3b75254c73b3 /actionpack/lib/action_controller/caching/actions.rb
parent2cd8d3b4c5b2a90da52bfe2e92455fdecfb89ac2 (diff)
parent07298fd0929ae1c6dd6d1b41bf320112d6bfc6a0 (diff)
downloadrails-73e9f4e9096515e9f4d97baaa914320c42159985.tar.gz
rails-73e9f4e9096515e9f4d97baaa914320c42159985.tar.bz2
rails-73e9f4e9096515e9f4d97baaa914320c42159985.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/caching/actions.rb')
-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 7c803a9830..34e1c3527f 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -113,7 +113,7 @@ module ActionController #:nodoc:
end
def caching_allowed(controller)
- controller.request.get? && controller.response.headers['Status'].to_i == 200
+ controller.request.get? && controller.response.status.to_i == 200
end
def cache_layout?