3 files changed, 10 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 0aae9f8579..0bd362fd64 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -36,6 +36,13 @@ module ActionController
         super
       end
 
+      def _determine_template(options)
+        if options.key?(:text) && options[:text].respond_to?(:to_text)
+          options[:text] = options[:text].to_text
+        end
+        super
+      end
+
       def format_for_text
         formats.first
       end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 55a5c22ac0..015a8212c4 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -6,8 +6,8 @@ module ActionController
   class Railtie < Rails::Railtie
     railtie_name :action_controller
 
-    require "action_controller/railties/subscriber"
-    subscriber ActionController::Railties::Subscriber.new
+    require "action_controller/railties/log_subscriber"
+    log_subscriber ActionController::Railties::LogSubscriber.new
 
     initializer "action_controller.logger" do
       ActionController::Base.logger ||= Rails.logger
diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb
index 4499e82292..df9ffa1717 100644
--- a/actionpack/lib/action_controller/railties/subscriber.rb
+++ b/actionpack/lib/action_controller/railties/log_subscriber.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Railties
-    class Subscriber < Rails::Subscriber
+    class LogSubscriber < Rails::LogSubscriber
       INTERNAL_PARAMS = %w(controller action format _method only_path)
 
       def start_processing(event)