1 files changed, 8 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index fce61cddfd..9d10140ed2 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,5 +1,7 @@
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
+require 'action_view'
+require 'action_view/view_paths'
 require 'set'
 
 module AbstractController
@@ -21,7 +23,7 @@ module AbstractController
     def render(*args, &block)
       options = _normalize_render(*args, &block)
       self.response_body = render_to_body(options)
-      _process_format(rendered_format)
+      _process_format(rendered_format, options) if rendered_format
       self.response_body
     end
 
@@ -46,7 +48,7 @@ module AbstractController
     def render_to_body(options = {})
     end
 
-    # Return Content-Type of rendered content
+    # Returns Content-Type of rendered content
     # :api: public
     def rendered_format
       Mime::TEXT
@@ -96,7 +98,7 @@ module AbstractController
 
     # Process the rendered format.
     # :api: private
-    def _process_format(format)
+    def _process_format(format, options = {})
     end
 
     # Normalize args and options.
@@ -104,7 +106,9 @@ module AbstractController
     def _normalize_render(*args, &block)
       options = _normalize_args(*args, &block)
       #TODO: remove defined? when we restore AP <=> AV dependency
-      options[:variant] = request.variant if defined?(request) && request.variant.present?
+      if defined?(request) && request && request.variant.present?
+        options[:variant] = request.variant
+      end
       _normalize_options(options)
       options
     end