aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-10-09 00:17:11 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-10-09 00:17:11 +0000
commit717e26dd0eceb96093962882f7ed4ca06cf15db2 (patch)
tree5664a40d5cee0c588c08da8fec57cfbe002e3284 /actionpack/lib/action_controller
parent3ba5e39b545a6917fb9a75abb484e0c017653917 (diff)
downloadrails-717e26dd0eceb96093962882f7ed4ca06cf15db2.tar.gz
rails-717e26dd0eceb96093962882f7ed4ca06cf15db2.tar.bz2
rails-717e26dd0eceb96093962882f7ed4ca06cf15db2.zip
Deprecation cleanup for rescues (closes #6339) [adam]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml8
1 files changed, 4 insertions, 4 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/>