aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base/base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-26 14:33:57 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-26 14:33:57 -0500
commit04949096797a390105c7ab9fb9b99938d5921dd4 (patch)
tree16316242f307d2f7a41189720ff10ebf44770b50 /actionpack/lib/action_controller/base/base.rb
parentc8919f4c7ca13ad78987ea0c8497abe85249975b (diff)
downloadrails-04949096797a390105c7ab9fb9b99938d5921dd4.tar.gz
rails-04949096797a390105c7ab9fb9b99938d5921dd4.tar.bz2
rails-04949096797a390105c7ab9fb9b99938d5921dd4.zip
Inherit TestSession from Session::AbstractStore and add indifferent access to Session::AbstractStore.
Diffstat (limited to 'actionpack/lib/action_controller/base/base.rb')
-rw-r--r--actionpack/lib/action_controller/base/base.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 3000b3d12f..afb9fb71cb 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -811,14 +811,8 @@ module ActionController #:nodoc:
end
def assign_shortcuts(request, response)
- @_request, @_params = request, request.parameters
-
- @_response = response
- @_response.session = request.session
-
- @_session = @_response.session
-
- @_headers = @_response.headers
+ @_request, @_response, @_params = request, response, request.parameters
+ @_session, @_headers = @_request.session, @_response.headers
end
def initialize_current_url