From 77acc004efad07dfd4d4f83be14ef897968a3fd9 Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Wed, 20 Jan 2016 19:16:23 -0500
Subject: Re-add ActionController::ApiRendering

- Fixes bug #23142.
- Bug was occurring only with ActionController::API, because `_process_options` wasn't being run for API requests, even though it was being run for normal app requests.
---
 actionpack/lib/action_controller/api.rb               |  2 +-
 actionpack/lib/action_controller/api/api_rendering.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 actionpack/lib/action_controller/api/api_rendering.rb

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
index 1a46d49a49..ff12705abe 100644
--- a/actionpack/lib/action_controller/api.rb
+++ b/actionpack/lib/action_controller/api.rb
@@ -112,7 +112,7 @@ module ActionController
 
       UrlFor,
       Redirecting,
-      Rendering,
+      ApiRendering,
       Renderers::All,
       ConditionalGet,
       BasicImplicitRender,
diff --git a/actionpack/lib/action_controller/api/api_rendering.rb b/actionpack/lib/action_controller/api/api_rendering.rb
new file mode 100644
index 0000000000..3a08d28c39
--- /dev/null
+++ b/actionpack/lib/action_controller/api/api_rendering.rb
@@ -0,0 +1,14 @@
+module ActionController
+  module ApiRendering
+    extend ActiveSupport::Concern
+
+    included do
+      include Rendering
+    end
+
+    def render_to_body(options = {})
+      _process_options(options)
+      super
+    end
+  end
+end
-- 
cgit v1.2.3