diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-13 20:32:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 20:32:30 -0500 |
| commit | 9ef26accd28e3a53a0e9180b2230806480e6144d (patch) | |
| tree | 28ef681c9007ea082f38bf7f7c07d39e42046883 /actionpack/lib/action_controller | |
| parent | debf35620f3ec06de4eb970600bbd35716984e9d (diff) | |
| parent | 6b3faf8e502dbd238fe4b4c409e96308638297a1 (diff) | |
| download | rails-9ef26accd28e3a53a0e9180b2230806480e6144d.tar.gz rails-9ef26accd28e3a53a0e9180b2230806480e6144d.tar.bz2 rails-9ef26accd28e3a53a0e9180b2230806480e6144d.zip | |
Merge pull request #34341 from gmcgibbon/parse_error_rescue_2
Allow rescue from parse errors
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/params_wrapper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index a678377d4f..7361946de5 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -253,7 +253,10 @@ module ActionController # This will display the wrapped hash in the log file. request.filtered_parameters.merge! wrapped_filtered_hash end - super + ensure + # NOTE: Rescues all exceptions so they + # may be caught in ActionController::Rescue. + return super end private |