diff options
Diffstat (limited to 'actionpack/lib/action_controller')
4 files changed, 14 insertions, 14 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 94e2d6a25f..743c97863a 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -294,7 +294,7 @@ module ActionController #:nodoc: # Holds the request object that's primarily used to get environment variables through access like # <tt>request.env["REQUEST_URI"]</tt>. - attr_accessor :request + attr_internal :request # Holds a hash of all the GET, POST, and Url parameters passed to the action. Accessed like <tt>params["post_id"]</tt> # to get the post_id. No type casts are made, so all values are returned as strings. @@ -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 session) + DEPRECATED_INSTANCE_VARIABLES = %w(flash params request session) # Gone after 1.2. def assign_deprecated_shortcuts(request, response) @@ -1128,7 +1128,7 @@ module ActionController #:nodoc: %w(@assigns @performed_redirect @performed_render) else %w(@assigns @performed_redirect @performed_render - @request @response @_params @_session @session + @_request @request @response @_params @params @_session @session @cookies @template @request_origin @parent_controller) end end diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index c05b1eb068..0515461910 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -139,22 +139,22 @@ module ActionController #:nodoc: self.class end end - + # Create a new request object based on the current request. # The new request inherits the session from the current request, # bypassing any session options set for the component controller's class def request_for_component(controller_name, options) - request = @request.dup - request.session = @request.session - - request.instance_variable_set( + new_request = request.dup + new_request.session = request.session + + new_request.instance_variable_set( :@parameters, (options[:params] || {}).with_indifferent_access.update( "controller" => controller_name, "action" => options[:action], "id" => options[:id] ) ) - - request + + new_request end def component_logging(options) diff --git a/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml b/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml index fa48b62f6f..e9faacef09 100644 --- a/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml +++ b/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml @@ -1,7 +1,7 @@ <h1> <%=h @exception.class.to_s %> - <% if @request.parameters['controller'] %> - in <%=h @request.parameters['controller'].humanize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %> + <% if request.parameters['controller'] %> + in <%=h request.parameters['controller'].humanize %>Controller<% if request.parameters['action'] %>#<%=h request.parameters['action'] %><% end %> <% end %> </h1> <pre><%=h @exception.clean_message %></pre> diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb index d9b10cebca..7cdf658437 100644 --- a/actionpack/lib/action_controller/verification.rb +++ b/actionpack/lib/action_controller/verification.rb @@ -85,7 +85,7 @@ module ActionController #:nodoc: if !prereqs_invalid && options[:method] prereqs_invalid ||= - [*options[:method]].all? { |v| @request.method != v.to_sym } + [*options[:method]].all? { |v| request.method != v.to_sym } end prereqs_invalid ||= (request.xhr? != options[:xhr]) unless options[:xhr].nil? |