Permalink
Browse files

Remove ERB trim variables from trace template in case ActionView::Bas…

…e.erb_trim_mode is changed in the application. Closes #10098 [tpope, kampers]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8813 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent efa739d commit 4a9fc4424ff7402326bf17c8bfd89bf6cbc42c8c @technoweenie technoweenie committed Feb 7, 2008
Showing with 7 additions and 5 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +5 −5 actionpack/lib/action_controller/templates/rescues/_trace.erb
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application. #10098 [tpope, kampers]
+
* Fix typo in form_helper documentation. #10650 [xaviershay, kampers]
* Fix bug with setting Request#format= after the getter has cached the value. #10889 [cch1]
View
10 actionpack/lib/action_controller/templates/rescues/_trace.erb
@@ -10,17 +10,17 @@
<p><code>RAILS_ROOT: <%= defined?(RAILS_ROOT) ? RAILS_ROOT : "unset" %></code></p>
<div id="traces">
- <% names.each do |name| -%>
+ <% names.each do |name| %>
<%
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 %>
- <% end -%>
+ <% end %>
- <% traces.each do |name, trace| -%>
+ <% traces.each do |name, trace| %>
<div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;">
<pre><code><%= trace.join "\n" %></code></pre>
</div>
- <% end -%>
-</div>
+ <% end %>
+</div>

0 comments on commit 4a9fc44

Please sign in to comment.