diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 02:26:01 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 02:26:01 -0800 |
| commit | 3e53fe635c6e7b82609219422458574e2f74b551 (patch) | |
| tree | 8cb4f4c7cb47541dcbe683c5e986dd0c0fdbdc08 /activesupport/lib/active_support/json/encoding.rb | |
| parent | 618923280048928aff50eed4fe9a9b08f9ebad72 (diff) | |
| parent | be79632b96d6fe6b844c99561ce96f540e98cae0 (diff) | |
| download | rails-3e53fe635c6e7b82609219422458574e2f74b551.tar.gz rails-3e53fe635c6e7b82609219422458574e2f74b551.tar.bz2 rails-3e53fe635c6e7b82609219422458574e2f74b551.zip | |
Merge pull request #8199 from senny/backport_8182
backport #8185, `#as_json` isolates options when encoding a hash.
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
| -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 91e4f07c6c..bd2f909ca9 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -61,7 +61,7 @@ module ActiveSupport # hashes and arrays need to get encoder in the options, so that they can detect circular references options.merge(:encoder => self) else - options + options.dup end end |