diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 703bb23948..48596f3618 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 [cmselmer] + * respond_to :html doesn't assume .rhtml. #6281 [Hampton Catlin] * Fixed some deprecation warnings in ActionPack [Rick Olson] diff --git a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml index d949ffc837..f2f5732ecd 100644 --- a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml +++ b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml @@ -41,4 +41,4 @@ <h2 style="margin-top: 30px">Response</h2> -<b>Headers</b>: <%=h response.headers.inspect.gsub(/,/, ",\n") %><br/> +<b>Headers</b>: <%=h response ? response.headers.inspect.gsub(/,/, ",\n") : "None" %><br/> |