github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own (closes #6295) [mnaberez]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5243 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2006-10-09 00:40:05 +00:00
parent 4b3e964a1a
commit 31d3048706
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [mnaberez]
* Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 [sven@c3d2.de]
* Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 [cmselmer]

2
actionpack/lib/action_controller/rescue.rb
View File

@@ -66,7 +66,7 @@ module ActionController #:nodoc:
def rescue_action_locally(exception)
add_variables_to_assigns
@template.instance_variable_set("@exception", exception)
@template.instance_variable_set("@rescues_path", File.dirname(__FILE__) + "/templates/rescues/")
@template.instance_variable_set("@rescues_path", File.dirname(rescues_path("stub")))
@template.send(:assign_variables_from_controller)
@template.instance_variable_set("@contents", @template.render_file(template_path_for_local_rescue(exception), false))