Permalink
Browse files

Merge pull request #5860 from arunagw/multi_json_upgrade_fix

fixed broken build after multi_json upgrade
  • Loading branch information...
2 parents 039a118 + 57baa0e commit fd12fe65044b504554a36ae886f336d3ec554fe8 @drogus drogus committed Apr 16, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 activesupport/activesupport.gemspec
  2. +3 −3 activesupport/lib/active_support/json/decoding.rb
View
2 activesupport/activesupport.gemspec
@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
s.rdoc_options.concat ['--encoding', 'UTF-8']
s.add_dependency('i18n', '~> 0.6')
- s.add_dependency('multi_json', '~> 1.0')
+ s.add_dependency('multi_json', '~> 1.3.0')
s.add_dependency('tzinfo', '~> 0.3.31')
end
View
6 activesupport/lib/active_support/json/decoding.rb
@@ -9,7 +9,7 @@ module ActiveSupport
module JSON
class << self
def decode(json, options ={})
- data = MultiJson.decode(json, options)
+ data = MultiJson.load(json, options)
if ActiveSupport.parse_json_times
convert_dates_from(data)
else
@@ -18,12 +18,12 @@ def decode(json, options ={})
end
def engine
- MultiJson.engine
+ MultiJson.adapter
end
alias :backend :engine
def engine=(name)
- MultiJson.engine = name
+ MultiJson.use(name)
end
alias :backend= :engine=

0 comments on commit fd12fe6

Please sign in to comment.