diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-12 17:53:17 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-12 17:53:17 -0800 |
| commit | d5c4370ef58cacb2c019160fb7bb79ffe1c7a67e (patch) | |
| tree | 2e1962c48129cf9c1c179f88f344553a913cc090 /activesupport/lib/active_support | |
| parent | 85cc7122bab1cfec661fdfe3bf4738d9fba55399 (diff) | |
| parent | 78dca351037c5f34971bdf0dd7d0b8fc9b9bdeb4 (diff) | |
| download | rails-d5c4370ef58cacb2c019160fb7bb79ffe1c7a67e.tar.gz rails-d5c4370ef58cacb2c019160fb7bb79ffe1c7a67e.tar.bz2 rails-d5c4370ef58cacb2c019160fb7bb79ffe1c7a67e.zip | |
Merge pull request #8185 from senny/8182_as_json_options_stick_around
`#as_json` isolates options when encoding a hash. Closes #8182
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index f65c831e04..7a5c351ca8 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -65,7 +65,7 @@ module ActiveSupport # they can detect circular references. options.merge(:encoder => self) else - options + options.dup end end |