diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-14 09:47:55 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-14 09:47:55 -0300 |
| commit | 24260dc0c8338aef8e24407e00750fd72a0366ea (patch) | |
| tree | 849b286decba65c1136947ef6f52235335df2383 /activesupport/lib/active_support/json/backends/jsongem.rb | |
| parent | 0489f0c582d2ab70595296f058545b102466bebd (diff) | |
| parent | 181cd109d9812d371e2d554a4846f0b2b25b1690 (diff) | |
| download | rails-24260dc0c8338aef8e24407e00750fd72a0366ea.tar.gz rails-24260dc0c8338aef8e24407e00750fd72a0366ea.tar.bz2 rails-24260dc0c8338aef8e24407e00750fd72a0366ea.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activesupport/lib/active_support/json/backends/jsongem.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/backends/jsongem.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/json/backends/jsongem.rb b/activesupport/lib/active_support/json/backends/jsongem.rb index 649e6301d1..c6c17a3c4e 100644 --- a/activesupport/lib/active_support/json/backends/jsongem.rb +++ b/activesupport/lib/active_support/json/backends/jsongem.rb @@ -2,10 +2,9 @@ require 'json' unless defined?(JSON) module ActiveSupport module JSON - ParseError = ::JSON::ParserError unless const_defined?(:ParseError) - module Backends module JSONGem + ParseError = ::JSON::ParserError extend self # Parses a JSON string or IO and convert it into an object @@ -38,4 +37,4 @@ module ActiveSupport end end end -end
\ No newline at end of file +end |