diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 10:13:14 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-12 10:13:14 -0700 |
| commit | 0fbb797e5f667443e49f3c3a2b370eb00dc48951 (patch) | |
| tree | a52d6b24e0a2cd16e78ef63a45e138a4ce7ee878 /activesupport/lib/active_support | |
| parent | 4bdf929579cf80713518cc12b4610dd3ae7a9adf (diff) | |
| parent | 52fb1a9565a2c1d163efa95f3d1a42247a4cc074 (diff) | |
| download | rails-0fbb797e5f667443e49f3c3a2b370eb00dc48951.tar.gz rails-0fbb797e5f667443e49f3c3a2b370eb00dc48951.tar.bz2 rails-0fbb797e5f667443e49f3c3a2b370eb00dc48951.zip | |
Merge pull request #12207 from chancancode/fix_json_load
Enabled quirks mode on JSON.parse, fixes broken test in af9caae
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index 2533ff43e1..21de09c1cc 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -14,7 +14,7 @@ module ActiveSupport # ActiveSupport::JSON.decode("{\"team\":\"rails\",\"players\":\"36\"}") # => {"team" => "rails", "players" => "36"} def decode(json, options = {}) - data = ::JSON.parse(json, options.merge(create_additions: false)) + data = ::JSON.parse(json, options.merge(create_additions: false, quirks_mode: true)) if ActiveSupport.parse_json_times convert_dates_from(data) else |