aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/rescue.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-09-17 16:20:32 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-09-17 16:20:32 +0000
commit2caf4d5a9337591c2728c7db826526febc5b2158 (patch)
tree4ca98abba378fa096e3e1664049fff0ad4098893 /actionpack/lib/action_controller/rescue.rb
parent55c6c64da0fbbfba74a0b4ad68022bf640a0a049 (diff)
downloadrails-2caf4d5a9337591c2728c7db826526febc5b2158.tar.gz
rails-2caf4d5a9337591c2728c7db826526febc5b2158.tar.bz2
rails-2caf4d5a9337591c2728c7db826526febc5b2158.zip
Added proper getters and setters for content type and charset [DHH] Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5129 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
-rw-r--r--actionpack/lib/action_controller/rescue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index f9b831f18b..b7df9fd125 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -71,7 +71,7 @@ module ActionController #:nodoc:
@template.instance_variable_set("@contents", @template.render_file(template_path_for_local_rescue(exception), false))
- @headers["Content-Type"] = "text/html"
+ response.content_type = Mime::HTML
render_file(rescues_path("layout"), response_code_for_rescue(exception))
end