1 files changed, 11 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index e971917ca2..6b17719381 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -54,6 +54,12 @@ module ActionController
 
     private
 
+      def _process_variant(options)
+        if defined?(request) && !request.nil? && request.variant.present?
+          options[:variant] = request.variant
+        end
+      end
+
       def _render_in_priorities(options)
         RENDER_FORMATS_IN_PRIORITY.each do |format|
           return options[format] if options.key?(format)
@@ -67,20 +73,20 @@ module ActionController
       end
 
       def _set_rendered_content_type(format)
-        unless response.content_type
+        if format && !response.content_type
           self.content_type = format.to_s
         end
       end
 
       # Normalize arguments by catching blocks and setting them on :update.
-      def _normalize_args(action = nil, options = {}, &blk) #:nodoc:
+      def _normalize_args(action = nil, options = {}, &blk)
         options = super
         options[:update] = blk if block_given?
         options
       end
 
       # Normalize both text and status options.
-      def _normalize_options(options) #:nodoc:
+      def _normalize_options(options)
         _normalize_text(options)
 
         if options[:html]
@@ -103,12 +109,12 @@ module ActionController
       end
 
       # Process controller specific options, as status, content-type and location.
-      def _process_options(options) #:nodoc:
+      def _process_options(options)
         status, content_type, location = options.values_at(:status, :content_type, :location)
 
         self.status = status if status
         self.content_type = content_type if content_type
-        self.headers["Location"] = url_for(location) if location
+        headers["Location"] = url_for(location) if location
 
         super
       end