diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-17 16:20:32 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-17 16:20:32 +0000 |
commit | 2caf4d5a9337591c2728c7db826526febc5b2158 (patch) | |
tree | 4ca98abba378fa096e3e1664049fff0ad4098893 /actionpack/lib/action_view | |
parent | 55c6c64da0fbbfba74a0b4ad68022bf640a0a049 (diff) | |
download | rails-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_view')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 2f12bdb3c4..5d1bf57c94 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -1,7 +1,6 @@ require 'erb' module ActionView #:nodoc: - class ActionViewError < StandardError #:nodoc: end @@ -441,11 +440,11 @@ module ActionView #:nodoc: if template_requires_setup?(extension) body = case extension.to_sym when :rxml + "@controller.response.content_type ||= 'application/xml'\n" + "xml = Builder::XmlMarkup.new(:indent => 2)\n" + - "@controller.headers['Content-Type'] ||= 'application/xml'\n" + template when :rjs - "@controller.headers['Content-Type'] ||= 'text/javascript'\n" + + "@controller.response.content_type ||= 'text/javascript'\n" + "update_page do |page|\n#{template}\nend" end else @@ -526,4 +525,4 @@ module ActionView #:nodoc: end end -require 'action_view/template_error' +require 'action_view/template_error'
\ No newline at end of file |