diff options
| author | Rick Olson <technoweenie@gmail.com> | 2008-02-07 17:06:53 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2008-02-07 17:06:53 +0000 |
| commit | 4a9fc4424ff7402326bf17c8bfd89bf6cbc42c8c (patch) | |
| tree | aefa07ba5655cdb84ad6b7fdef694a20fe2800ee /actionpack/lib/action_controller/templates | |
| parent | efa739d73d8108c92ceedb41a862c7b8f028c7e1 (diff) | |
| download | rails-4a9fc4424ff7402326bf17c8bfd89bf6cbc42c8c.tar.gz rails-4a9fc4424ff7402326bf17c8bfd89bf6cbc42c8c.tar.bz2 rails-4a9fc4424ff7402326bf17c8bfd89bf6cbc42c8c.zip | |
Remove ERB trim variables from trace template in case ActionView::Base.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
Diffstat (limited to 'actionpack/lib/action_controller/templates')
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/_trace.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/_trace.erb b/actionpack/lib/action_controller/templates/rescues/_trace.erb index b322b0aaae..bb2d8375bd 100644 --- a/actionpack/lib/action_controller/templates/rescues/_trace.erb +++ b/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>
\ No newline at end of file + <% end %> +</div> |