diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2015-10-19 13:11:19 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2015-10-19 13:11:19 -0200 |
| commit | b456e76f58a05a127bb670e63a9446e457f1f59d (patch) | |
| tree | 68abd2546ae7b8289007def1f32719916b7a3ca1 /actionpack/lib/action_controller | |
| parent | dd2c94aea6de51b58f75f192e5de16e791b9d2d9 (diff) | |
| parent | 3f81b3753ffdca8617422e518e1fddd581f5a712 (diff) | |
| download | rails-b456e76f58a05a127bb670e63a9446e457f1f59d.tar.gz rails-b456e76f58a05a127bb670e63a9446e457f1f59d.tar.bz2 rails-b456e76f58a05a127bb670e63a9446e457f1f59d.zip | |
Merge pull request #21999 from agis-/param-encoding-errors
Show helpful messages on invalid param. encodings
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/exceptions.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb index 18e003741d..5260dc0336 100644 --- a/actionpack/lib/action_controller/metal/exceptions.rb +++ b/actionpack/lib/action_controller/metal/exceptions.rb @@ -5,12 +5,10 @@ module ActionController class BadRequest < ActionControllerError #:nodoc: attr_reader :original_exception - def initialize(type = nil, e = nil) - return super() unless type && e - - super("Invalid #{type} parameters: #{e.message}") + def initialize(msg = nil, e = nil) + super(msg) @original_exception = e - set_backtrace e.backtrace + set_backtrace e.backtrace if e end end |