diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-21 18:11:09 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-21 18:11:09 -0700 |
| commit | f8f077945f4d108d676384106a9dfcf5c6f7a33d (patch) | |
| tree | d0e62bf6f782363b7d1512f6bb190d3656bf837f /actionpack/lib/action_controller/base.rb | |
| parent | aab2f0b353d4d8d80605dda328ca3c28f680e2b1 (diff) | |
| download | rails-f8f077945f4d108d676384106a9dfcf5c6f7a33d.tar.gz rails-f8f077945f4d108d676384106a9dfcf5c6f7a33d.tar.bz2 rails-f8f077945f4d108d676384106a9dfcf5c6f7a33d.zip | |
Move default content type and charset from Base to Response. Handle charset = nil.
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 09414e7702..ea7d336640 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -548,7 +548,6 @@ module ActionController #:nodoc: @@guard.synchronize { send(method, *arguments) } end - assign_default_content_type_and_charset response.prepare! unless component_request? response ensure @@ -1219,15 +1218,6 @@ module ActionController #:nodoc: @action_name = (params['action'] || 'index') end - def assign_default_content_type_and_charset - response.content_type ||= Mime::HTML - response.charset ||= self.class.default_charset unless sending_file? - end - - def sending_file? - response.headers["Content-Transfer-Encoding"] == "binary" - end - def action_methods self.class.action_methods end |