aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/rendering.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb9
1 files changed, 3 insertions, 6 deletions
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