diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-26 17:24:37 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-01-26 17:24:37 -0800 |
| commit | 9777a97ffaedcec9b95cb1678e4c74b7cac514ea (patch) | |
| tree | 95ce3be36d397df75196ed98202636599689de9f /actionpack | |
| parent | 0361d8449ff1c18da041df4b7dfe648abf0f1887 (diff) | |
| parent | f31a386c7ecdfe8a9173655b515470a2fbc9fcdd (diff) | |
| download | rails-9777a97ffaedcec9b95cb1678e4c74b7cac514ea.tar.gz rails-9777a97ffaedcec9b95cb1678e4c74b7cac514ea.tar.bz2 rails-9777a97ffaedcec9b95cb1678e4c74b7cac514ea.zip | |
Merge pull request #23242 from maclover7/fix-error-sec
Fix undefined error for `ActionController::Parameters`
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 9 |
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 |