diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 14:34:37 +0100 |
| commit | ae812c0a7bdb876c03752adfaa980ac4e74f2e17 (patch) | |
| tree | 73eba5b0ddce60a4578fcbf6be581b8f35488273 /activeresource/lib | |
| parent | 67f30fd9639409877a57a7ba758cd13496433d69 (diff) | |
| parent | 3c4c6bd0df598f865f49a983b4c65c415af4bcfc (diff) | |
| download | rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.gz rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.tar.bz2 rails-ae812c0a7bdb876c03752adfaa980ac4e74f2e17.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activeresource/lib')
| -rw-r--r-- | activeresource/lib/active_resource/base.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 6cb5beb789..2e742267ba 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -887,9 +887,12 @@ module ActiveResource # person.to_json(:except => ["first_name"]) # # => {"last_name": "Smith"} def to_json(options={}) - attributes.to_json(options) + ActiveSupport::JSON.encode(attributes, options) end + # For compatibility with ActiveSupport::JSON.encode + alias rails_to_json to_json + # Returns the serialized string representation of the resource in the configured # serialization format specified in ActiveResource::Base.format. The options # applicable depend on the configured encoding format. |