1 files changed, 6 insertions, 12 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index f94d1c669c..22f9ab219c 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -16,17 +16,12 @@ module ActionController
       cattr_accessor :allow_concurrency
       self.allow_concurrency = false
 
-      cattr_accessor :param_parsers
-      self.param_parsers = { Mime::MULTIPART_FORM   => :multipart_form,
-                             Mime::URL_ENCODED_FORM => :url_encoded_form,
-                             Mime::XML              => :xml_simple,
-                             Mime::JSON             => :json }
-
       cattr_accessor :relative_url_root
       self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
 
-      cattr_accessor :default_charset
-      self.default_charset = "utf-8"
+      class << self
+        delegate :default_charset=, :to => "ActionDispatch::Response"
+      end
 
       # cattr_reader :protected_instance_variables
       cattr_accessor :protected_instance_variables
@@ -101,11 +96,10 @@ module ActionController
         options[:template].sub!(/^\//, '')
       end
 
-      options[:text] = nil if options[:nothing] == true
+      options[:text] = nil if options.delete(:nothing) == true
+      options[:text] = " " if options.key?(:text) && options[:text].nil?
 
-      body = super
-      body = [' '] if body.blank?
-      body
+      super || " "
     end
 
     def _handle_method_missing