Skip to content
Browse files

Fixed error handling of broken layouts #1115 [Michael Schubert]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1173 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 5feb7e2 commit db16349bc15a726458aa33ca50af9dc7a6ef2d45 @dhh dhh committed Apr 17, 2005
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed error handling of broken layouts #1115 [Michael Schubert]
+
* Changed render_partial to take local assigns as the second parameter instead of an explicit object and then the assigns. So the API changes from:
<%= render_partial "account", person, "rules" => regulations.rules %>
View
2 actionpack/lib/action_controller/templates/rescues/template_error.rhtml
@@ -1,6 +1,6 @@
<h1>
<%=h @exception.original_exception.class.to_s %> in
- <%=h @request.parameters["controller"].capitalize %>#<%=h @request.parameters["action"] %>
+ <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
</h1>
<p>

0 comments on commit db16349

Please sign in to comment.
Something went wrong with that request. Please try again.