diff options
Diffstat (limited to 'actionpack/lib/action_controller/dispatch')
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/rescue.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/dispatch/rescue.rb b/actionpack/lib/action_controller/dispatch/rescue.rb index ec9eff65a9..df80ac0909 100644 --- a/actionpack/lib/action_controller/dispatch/rescue.rb +++ b/actionpack/lib/action_controller/dispatch/rescue.rb @@ -38,7 +38,7 @@ module ActionController #:nodoc: 'ActionView::TemplateError' => 'template_error' } - RESCUES_TEMPLATE_PATH = ActionView::Template::EagerPath.new( + RESCUES_TEMPLATE_PATH = ActionView::Template::FileSystemPath.new( File.join(File.dirname(__FILE__), "templates")) def self.included(base) #:nodoc: @@ -165,7 +165,7 @@ module ActionController #:nodoc: end def rescues_path(template_name) - RESCUES_TEMPLATE_PATH.find_template("rescues/#{template_name}.erb") + RESCUES_TEMPLATE_PATH.find_by_parts("rescues/#{template_name}.erb") end def template_path_for_local_rescue(exception) diff --git a/actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb b/actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb index 95be64511d..e5c647c826 100644 --- a/actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb +++ b/actionpack/lib/action_controller/dispatch/templates/rescues/diagnostics.erb @@ -6,5 +6,5 @@ </h1> <pre><%=h @exception.clean_message %></pre> -<%= @template._render_template(@rescues_path.find_template("rescues/_trace.erb")) %> -<%= @template._render_template(@rescues_path.find_template("rescues/_request_and_response.erb")) %>
\ No newline at end of file +<%= @template._render_template(@rescues_path.find_by_parts("rescues/_trace.erb")) %> +<%= @template._render_template(@rescues_path.find_by_parts("rescues/_request_and_response.erb")) %>
\ No newline at end of file |