Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed that rescue template path shouldn't be hardcoded, then it's eas…

…ier to hook in your own (closes #6295) [mnaberez]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5243 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 31d3048706eee65673eeebe28d76064632420a97 1 parent 4b3e964
David Heinemeier Hansson dhh authored
2  actionpack/CHANGELOG
View
@@ -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
@@ -66,7 +66,7 @@ def local_request? #:doc:
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))
Please sign in to comment.
Something went wrong with that request. Please try again.