diff options
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/object.rb')
-rw-r--r-- | activesupport/lib/active_support/json/encoders/object.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/encoders/object.rb b/activesupport/lib/active_support/json/encoders/object.rb index 0475967aee..9cc12d91ac 100644 --- a/activesupport/lib/active_support/json/encoders/object.rb +++ b/activesupport/lib/active_support/json/encoders/object.rb @@ -2,7 +2,12 @@ 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 = {}) - ActiveSupport::JSON.encode(instance_values, options) + def to_json(options = nil) + ActiveSupport::JSON.encode(self, options) end + + private + def rails_to_json(*args) + ActiveSupport::JSON.encode(instance_values, *args) + end end |