diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-09 01:38:17 +0100 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-09 01:38:17 +0100 |
| commit | 13c6c3cfc59ff0b400b294dce15f32752b0fb5f5 (patch) | |
| tree | 052ac9c8f4adb91a4b32e3b2a97b1bc6bdace2e6 /actionpack/lib/action_controller/templates/rescues/template_error.erb | |
| parent | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (diff) | |
| parent | 4e60eebae05aeec65e4894e3901c9d61c9b32910 (diff) | |
| download | rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.tar.gz rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.tar.bz2 rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.zip | |
Merge commit 'origin/master' into savepoints
Diffstat (limited to 'actionpack/lib/action_controller/templates/rescues/template_error.erb')
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/template_error.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.erb b/actionpack/lib/action_controller/templates/rescues/template_error.erb index 76fa3df89d..2e34e03bd5 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") %> +<%= render :file => @rescues_path["rescues/_trace.erb"] %> <% @exception = @real_exception %> -<%= render(:file => @rescues_path + "/_request_and_response.erb") %> +<%= render :file => @rescues_path["rescues/_request_and_response.erb"] %> |