From 534b12afb5cd0240128c3552394004f15b18520c Mon Sep 17 00:00:00 2001
From: Jon Moss <me@jonathanmoss.me>
Date: Mon, 25 Jan 2016 15:21:11 -0500
Subject: Fix undefined error for `ActionController::Parameters`

---
 actionpack/lib/abstract_controller/rendering.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 63fd76d9b7..841a4c07ad 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -82,13 +82,10 @@ module AbstractController
     # <tt>render :file => "foo/bar"</tt>.
     # :api: plugin
     def _normalize_args(action=nil, options={})
-      case action
-      when ActionController::Parameters
-        unless action.permitted?
-          raise ArgumentError, "render parameters are not permitted"
-        end
+      if action.respond_to?(:permitted?) && action.permitted?
+        raise ArgumentError, "render parameters are not permitted"
         action
-      when Hash
+      elsif action.is_a?(Hash)
         action
       else
         options
-- 
cgit v1.2.3