From 418ce487c4a41df2c3a3c1485107f32eb94fa493 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 19 Oct 2009 18:46:59 -0700 Subject: Only undef to_json if it's defined --- actionpack/lib/action_controller/metal/responder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/metal/responder.rb') diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb index a16ed97131..c6e847ba0f 100644 --- a/actionpack/lib/action_controller/metal/responder.rb +++ b/actionpack/lib/action_controller/metal/responder.rb @@ -95,7 +95,7 @@ module ActionController #:nodoc: delegate :get?, :post?, :put?, :delete?, :to => :request # Undefine :to_json since it's defined on Object - undef_method :to_json + undef_method(:to_json) if method_defined?(:to_json) # Initializes a new responder an invoke the proper format. If the format is # not defined, call to_format. -- cgit v1.2.3