diff options
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/cookies.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 743c97863a..02d731c4c8 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1014,7 +1014,7 @@ module ActionController #:nodoc: end def assign_shortcuts(request, response) - @_request, @_params, @cookies = request, request.parameters, request.cookies + @_request, @_params, @_cookies = request, request.parameters, request.cookies @response = response @response.session = request.session @@ -1030,7 +1030,7 @@ module ActionController #:nodoc: # TODO: assigns cookies headers params request response template - DEPRECATED_INSTANCE_VARIABLES = %w(flash params request session) + DEPRECATED_INSTANCE_VARIABLES = %w(cookies flash params request session) # Gone after 1.2. def assign_deprecated_shortcuts(request, response) @@ -1129,7 +1129,7 @@ module ActionController #:nodoc: else %w(@assigns @performed_redirect @performed_render @_request @request @response @_params @params @_session @session - @cookies @template @request_origin @parent_controller) + @_cookies @cookies @template @request_origin @parent_controller) end end diff --git a/actionpack/lib/action_controller/cookies.rb b/actionpack/lib/action_controller/cookies.rb index f5484f3676..67086a09cb 100644 --- a/actionpack/lib/action_controller/cookies.rb +++ b/actionpack/lib/action_controller/cookies.rb @@ -39,7 +39,7 @@ module ActionController #:nodoc: class CookieJar < Hash #:nodoc: def initialize(controller) - @controller, @cookies = controller, controller.instance_variable_get("@cookies") + @controller, @cookies = controller, controller.request.cookies super() update(@cookies) end |