Now that we have a separate internal rails_to_json, use a separate circular reference stack instead of sticking it in the options hash

1 files changed, 3 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/json/encoders/object.rb b/activesupport/lib/active_support/json/encoders/object.rb
index 4722feb7db..9cc12d91ac 100644
--- a/activesupport/lib/active_support/json/encoders/object.rb
+++ b/activesupport/lib/active_support/json/encoders/object.rb
@@ -3,11 +3,11 @@ require 'active_support/core_ext/object/instance_variables'
 class Object
   # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info.
   def to_json(options = nil)
-    rails_to_json(options)
+    ActiveSupport::JSON.encode(self, options)
   end
 
   private
-    def rails_to_json(options = nil)
-      ActiveSupport::JSON.encode(instance_values, options)
+    def rails_to_json(*args)
+      ActiveSupport::JSON.encode(instance_values, *args)
     end
 end