aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/templates
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-09-18 10:35:42 -0700
committerYehuda Katz <wycats@gmail.com>2009-09-18 10:35:42 -0700
commit81c421386c3989e96f1fd3b0370b75155eeda2e1 (patch)
tree89dd8faf31fd6916777335b89de47ca42e06ef09 /actionpack/lib/action_dispatch/middleware/templates
parentf183288050beedf3a89e0bf5b9059bb014346097 (diff)
downloadrails-81c421386c3989e96f1fd3b0370b75155eeda2e1.tar.gz
rails-81c421386c3989e96f1fd3b0370b75155eeda2e1.tar.bz2
rails-81c421386c3989e96f1fd3b0370b75155eeda2e1.zip
1.9 fix for changes to #to_s. By Sam Ruby. [#3228 state:resolved]
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/templates')
-rw-r--r--actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
index bb2d8375bd..f8f6b424ca 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
@@ -15,12 +15,12 @@
show = "document.getElementById('#{name.gsub /\s/, '-'}').style.display='block';"
hide = (names - [name]).collect {|hide_name| "document.getElementById('#{hide_name.gsub /\s/, '-'}').style.display='none';"}
%>
- <a href="#" onclick="<%= hide %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %>
+ <a href="#" onclick="<%= hide.join %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %>
<% end %>
<% traces.each do |name, trace| %>
<div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;">
- <pre><code><%= trace.join "\n" %></code></pre>
+ <pre><code><%=h trace.join "\n" %></code></pre>
</div>
<% end %>
</div>