aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/templates/rescues/template_error.rhtml')
-rw-r--r--actionpack/lib/action_controller/templates/rescues/template_error.rhtml10
1 files changed, 1 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
index 326fd0b057..405a2e070a 100644
--- a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml
@@ -1,11 +1,3 @@
-<%
- base_dir = File.expand_path(File.dirname(__FILE__))
-
- framework_trace = @exception.original_exception.backtrace.collect do |line|
- line.gsub(base_dir, "").gsub("/../config/environments/../../", "")
- end
-%>
-
<h1>
<%=h @exception.original_exception.class.to_s %> in
<%=h @request.parameters["controller"].capitalize %>#<%=h @request.parameters["action"] %>
@@ -21,6 +13,6 @@
<p><%=h @exception.sub_template_message %></p>
<a href="#" onclick="document.getElementById('framework_trace').style.display='block'">Show template trace</a>
-<pre id="framework_trace" style="display:none"><code><%=h framework_trace.join("\n") %></code></pre>
+<pre id="framework_trace" style="display:none"><code><%=h @exception.original_exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }.join("\n") %></code></pre>
<%= render_file(@rescues_path + "/_request_and_response.rhtml", false) %>