aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-10-25 13:51:30 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-10-25 13:51:30 -0700
commit59a53f45258d10e689fc9dc0f0cf18746dd13579 (patch)
treec413d157294b5c83c077436c89e48af8b87595ba
parentcde326bcefa7e842d5f8090d24b700399ac3d705 (diff)
downloadrails-59a53f45258d10e689fc9dc0f0cf18746dd13579.tar.gz
rails-59a53f45258d10e689fc9dc0f0cf18746dd13579.tar.bz2
rails-59a53f45258d10e689fc9dc0f0cf18746dd13579.zip
remain backwards compatible, exception can be constructed with no arguments
-rw-r--r--actionpack/lib/action_controller/metal/exceptions.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index cf21d26752..3844dbf2a6 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -5,7 +5,9 @@ module ActionController
class BadRequest < ActionControllerError #:nodoc:
attr_reader :original_exception
- def initialize(type, e)
+ def initialize(type = nil, e = nil)
+ return super() unless type && e
+
super("Invalid #{type} parameters: #{e.message}")
@original_exception = e
set_backtrace e.backtrace