From 59a53f45258d10e689fc9dc0f0cf18746dd13579 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 25 Oct 2012 13:51:30 -0700
Subject: remain backwards compatible, exception can be constructed with no
 arguments

---
 actionpack/lib/action_controller/metal/exceptions.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

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
-- 
cgit v1.2.3