diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-10-29 00:37:29 -0400 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-10-29 00:44:12 -0400 |
| commit | 51c24ae3e3c1a260a304042aff5e1a7c56faabfe (patch) | |
| tree | e7d2d4aab16ea617de48ac19df3f66a725eb9cb8 /actionpack/lib/action_dispatch/http/request.rb | |
| parent | a288b74f1c75c6f100de7611a5093a421f1ad6d1 (diff) | |
| download | rails-51c24ae3e3c1a260a304042aff5e1a7c56faabfe.tar.gz rails-51c24ae3e3c1a260a304042aff5e1a7c56faabfe.tar.bz2 rails-51c24ae3e3c1a260a304042aff5e1a7c56faabfe.zip | |
Caching refactoring
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rwxr-xr-x | actionpack/lib/action_dispatch/http/request.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index bb99fac5e0..75be2cc260 100755 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -98,7 +98,7 @@ module ActionDispatch end def forgery_whitelisted? - method == :get || xhr? || !(!content_type.nil? && content_type.verify_request?) + method == :get || xhr? || content_type.nil? || !content_type.verify_request? end def media_type @@ -205,10 +205,6 @@ module ActionDispatch end end - def cache_format - parameters[:format] - end - # Returns true if the request's "X-Requested-With" header contains # "XMLHttpRequest". (The Prototype Javascript library sends this header with # every Ajax request.) |