From de59e6ebad0cc829e60e2444f03230aef8228980 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 5 Aug 2015 17:24:48 -0700 Subject: move env access to the request object. Accessing a request object has nice advantages over accessing a hash. If you use a missing method name, you'll get an exception rather than a `nil` (is one nice feature) --- actionpack/lib/action_controller/metal/request_forgery_protection.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller/metal/request_forgery_protection.rb') diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index 9e09242872..99c2287fcb 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -161,11 +161,11 @@ module ActionController #:nodoc: class NullCookieJar < ActionDispatch::Cookies::CookieJar #:nodoc: def self.build(request) - key_generator = request.env[ActionDispatch::Cookies::GENERATOR_KEY] + key_generator = request.key_generator host = request.host secure = request.ssl? - new(key_generator, host, secure, options_for_env({})) + new(key_generator, host, secure, options_for_req(request)) end def write(*) -- cgit v1.2.3