diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-21 22:13:45 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-21 22:13:45 -0700 |
| commit | ab33b27947864d94be667db836e0ad7497575d13 (patch) | |
| tree | 4a2ae0afd8776fe7f2bfe8e5b3f35b472526bba5 /actionpack/lib/action_controller/templates/rescues | |
| parent | 6e3d2a7996f52bd0d7a5157f73a471307ba8aabd (diff) | |
| parent | 0096f5586987b720ca24c09103c9371f64ed26e5 (diff) | |
| download | rails-ab33b27947864d94be667db836e0ad7497575d13.tar.gz rails-ab33b27947864d94be667db836e0ad7497575d13.tar.bz2 rails-ab33b27947864d94be667db836e0ad7497575d13.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/templates/rescues')
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/diagnostics.erb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/template_error.erb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/diagnostics.erb b/actionpack/lib/action_controller/templates/rescues/diagnostics.erb index 385c6c1b09..b5483eccae 100644 --- a/actionpack/lib/action_controller/templates/rescues/diagnostics.erb +++ b/actionpack/lib/action_controller/templates/rescues/diagnostics.erb @@ -6,6 +6,6 @@ </h1> <pre><%=h @exception.clean_message %></pre> -<%= render(:file => @rescues_path + "/_trace.erb", :use_full_path => false) %> +<%= render(:file => @rescues_path + "/_trace.erb") %> -<%= render(:file => @rescues_path + "/_request_and_response.erb", :use_full_path => false) %> +<%= render(:file => @rescues_path + "/_request_and_response.erb") %> diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.erb b/actionpack/lib/action_controller/templates/rescues/template_error.erb index 4aecc68d18..76fa3df89d 100644 --- a/actionpack/lib/action_controller/templates/rescues/template_error.erb +++ b/actionpack/lib/action_controller/templates/rescues/template_error.erb @@ -15,7 +15,7 @@ <% @real_exception = @exception @exception = @exception.original_exception || @exception %> -<%= render(:file => @rescues_path + "/_trace.erb", :use_full_path => false) %> +<%= render(:file => @rescues_path + "/_trace.erb") %> <% @exception = @real_exception %> -<%= render(:file => @rescues_path + "/_request_and_response.erb", :use_full_path => false) %> +<%= render(:file => @rescues_path + "/_request_and_response.erb") %> |