Fix undefined error for ActionController::Parameters

rails · Jan 27, 2016 · 534b12a · 534b12a
1 parent 6dfab47
commit 534b12a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
@@ -82,13 +82,10 @@ def view_assigns
     # <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