diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-17 06:11:58 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-17 06:11:58 +0000 |
| commit | db16349bc15a726458aa33ca50af9dc7a6ef2d45 (patch) | |
| tree | 5cbb84183188ec17d134907a107562fa99fc2579 | |
| parent | 5feb7e26e8ae45030e075ec387e4c0cccc3b05ec (diff) | |
| download | rails-db16349bc15a726458aa33ca50af9dc7a6ef2d45.tar.gz rails-db16349bc15a726458aa33ca50af9dc7a6ef2d45.tar.bz2 rails-db16349bc15a726458aa33ca50af9dc7a6ef2d45.zip | |
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
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/template_error.rhtml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 0687be4698..70bf24c414 100644 --- a/actionpack/CHANGELOG +++ b/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 %> diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml index 9a331b9bf2..074d3a0bc0 100644 --- a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml +++ b/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> |