diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-10-16 19:59:46 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-10-16 19:59:46 +0000 |
| commit | 2d3367669156ec4149c8773a6afa93d220c36e7f (patch) | |
| tree | 0ec17d36400d58f0323f3bc39fc19641f6058ffb /actionpack | |
| parent | 03b383853d3e1de85cf1b345e2b0dd5cb1f42479 (diff) | |
| download | rails-2d3367669156ec4149c8773a6afa93d220c36e7f.tar.gz rails-2d3367669156ec4149c8773a6afa93d220c36e7f.tar.bz2 rails-2d3367669156ec4149c8773a6afa93d220c36e7f.zip | |
Fix deprecation warnings when rendering the template error template.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5315 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -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 94044a8876..91b786eb59 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix deprecation warnings when rendering the template error template. [Nicholas Seckar] + * Fix routing to correctly determine when generation fails. Closes #6300. [psross]. * Fix broken assert_generates when extra keys are being checked. [Jamis Buck] diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.rhtml b/actionpack/lib/action_controller/templates/rescues/template_error.rhtml index 2cf812cd5f..827d66467d 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 if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %> + <%=h request.parameters["controller"].capitalize if request.parameters["controller"]%>#<%=h request.parameters["action"] %> </h1> <p> |