diff options
| author | Eugene Kenny <elkenny@gmail.com> | 2019-08-04 00:35:49 +0100 |
|---|---|---|
| committer | Eugene Kenny <elkenny@gmail.com> | 2019-08-04 00:35:49 +0100 |
| commit | 7cf445d3bdc466f26b4a1929822ccd34daac19a7 (patch) | |
| tree | c8c695361466cb001623a001e8f247ce35e8ce50 /actionpack/lib/action_controller/metal/request_forgery_protection.rb | |
| parent | 6db2c426c0156dd3738673a676261693cfe92a8d (diff) | |
| download | rails-7cf445d3bdc466f26b4a1929822ccd34daac19a7.tar.gz rails-7cf445d3bdc466f26b4a1929822ccd34daac19a7.tar.bz2 rails-7cf445d3bdc466f26b4a1929822ccd34daac19a7.zip | |
Use media_type instead of content_type internally
These calls to `content_type` were triggering the deprecation from
c631e8d011a7cf3e7ade4e9e8db56d2b89bd530c in upgraded applications.
We can use `media_type` in all of these cases to avoid the deprecation.
Diffstat (limited to 'actionpack/lib/action_controller/metal/request_forgery_protection.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index e923afb17c..31df6cea0f 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -280,7 +280,7 @@ module ActionController #:nodoc: # Check for cross-origin JavaScript responses. def non_xhr_javascript_response? # :doc: - %r(\A(?:text|application)/javascript).match?(content_type) && !request.xhr? + %r(\A(?:text|application)/javascript).match?(media_type) && !request.xhr? end AUTHENTICITY_TOKEN_LENGTH = 32 |