From 1d8be7bc6f098b829ac14ef457af688043975ddc Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Tue, 19 Apr 2011 00:01:50 +0200
Subject: AS Json parse_error makes a return for backwards compatibility,
 although it will return MultiJson::DecodeError

---
 activesupport/lib/active_support/json/decoding.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activesupport/lib')

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)
-- 
cgit v1.2.3