diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-12-20 21:25:09 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-12-20 21:25:47 -0600 |
| commit | 3b317b7100c9a416f4e3545f3844f0c0743acdb2 (patch) | |
| tree | b94cd268610a51756fc6418f1983a333e37420a1 /actionpack/lib/action_controller/base.rb | |
| parent | 606cd61b9a2a710a27c2e482b5dace100cce9779 (diff) | |
| download | rails-3b317b7100c9a416f4e3545f3844f0c0743acdb2.tar.gz rails-3b317b7100c9a416f4e3545f3844f0c0743acdb2.tar.bz2 rails-3b317b7100c9a416f4e3545f3844f0c0743acdb2.zip | |
Switch to Rack::Response#set_cookie instead of using CGI::Cookie to build cookie headers
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index eae17d6dd5..3e001a2ed6 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -254,7 +254,7 @@ module ActionController #:nodoc: cattr_reader :protected_instance_variables # Controller specific instance variables which will not be accessible inside views. @@protected_instance_variables = %w(@assigns @performed_redirect @performed_render @variables_added @request_origin @url @parent_controller - @action_name @before_filter_chain_aborted @action_cache_path @_session @_cookies @_headers @_params + @action_name @before_filter_chain_aborted @action_cache_path @_session @_headers @_params @_flash @_response) # Prepends all the URL-generating helpers from AssetHelper. This makes it possible to easily move javascripts, stylesheets, @@ -1193,7 +1193,7 @@ module ActionController #:nodoc: end def assign_shortcuts(request, response) - @_request, @_params, @_cookies = request, request.parameters, request.cookies + @_request, @_params = request, request.parameters @_response = response @_response.session = request.session |