aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/templates
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-29 08:26:45 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-29 08:26:45 +0000
commitd15d15b2c236a556f89536961adf2de7f1fd04dc (patch)
tree37f35f4cec5c7bdf34cbf6fbcd2a5ef44cf8a97c /actionpack/lib/action_controller/templates
parentd7b5b44a0e6fddb772c1c0779489c17e1caa4a39 (diff)
downloadrails-d15d15b2c236a556f89536961adf2de7f1fd04dc.tar.gz
rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.tar.bz2
rails-d15d15b2c236a556f89536961adf2de7f1fd04dc.zip
Deprecate @response
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/templates')
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml8
-rw-r--r--actionpack/lib/action_controller/templates/rescues/template_error.rhtml2
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
index 82007ff5e6..d949ffc837 100644
--- a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
@@ -8,7 +8,7 @@
<% if false %>
<br /><br />
<% begin %>
- <%= form_tag(@request.request_uri, "method" => @request.method) %>
+ <%= form_tag(request.request_uri, "method" => request.method) %>
<input type="hidden" name="BP-RETRY" value="1" />
<% for key, values in params %>
@@ -26,7 +26,7 @@
<% end %>
<%
- request_parameters_without_action = @request.parameters.clone
+ request_parameters_without_action = request.parameters.clone
request_parameters_without_action.delete("action")
request_parameters_without_action.delete("controller")
@@ -37,8 +37,8 @@
<p><b>Parameters</b>: <%=h request_dump == "{}" ? "None" : request_dump %></p>
<p><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></p>
-<div id="session_dump" style="display:none"><%= debug(@request.session.instance_variable_get("@data")) %></div>
+<div id="session_dump" style="display:none"><%= debug(request.session.instance_variable_get("@data")) %></div>
<h2 style="margin-top: 30px">Response</h2>
-<b>Headers</b>: <%=h @response.headers.inspect.gsub(/,/, ",\n") %><br/>
+<b>Headers</b>: <%=h response.headers.inspect.gsub(/,/, ",\n") %><br/>
diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
index 2cf812cd5f..827d66467d 100644
--- a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
@@ -1,6 +1,6 @@
<h1>
<%=h @exception.original_exception.class.to_s %> in
- <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
+ <%=h request.parameters["controller"].capitalize if request.parameters["controller"]%>#<%=h request.parameters["action"] %>
</h1>
<p>