diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-19 00:01:50 +0200 |
|---|---|---|
| committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-19 00:01:50 +0200 |
| commit | 1d8be7bc6f098b829ac14ef457af688043975ddc (patch) | |
| tree | d0358a42fe6312d6d06a9d35a109716cdf75aa19 /activesupport/lib | |
| parent | e019587e31abe66416c0b5d26b6ac177b345a727 (diff) | |
| download | rails-1d8be7bc6f098b829ac14ef457af688043975ddc.tar.gz rails-1d8be7bc6f098b829ac14ef457af688043975ddc.tar.bz2 rails-1d8be7bc6f098b829ac14ef457af688043975ddc.zip | |
AS Json parse_error makes a return for backwards compatibility, although it will return MultiJson::DecodeError
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index ac99f180a5..cbeb6c0a28 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -34,6 +34,10 @@ module ActiveSupport self.backend = old_backend end + def parse_error + MultiJson::DecodeError + end + private def convert_dates_from(data) |