From f4c8a4b71fcce46c3259240b50f30e134e14c4a2 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Mon, 14 Jul 2014 10:38:14 -0700 Subject: Merge pull request #16162 from chancancode/fix_json_coder Fixed JSON coder when loading NULL from DB --- activerecord/lib/active_record/coders/json.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/coders/json.rb b/activerecord/lib/active_record/coders/json.rb index 0f60b6dab2..75d3bfe625 100644 --- a/activerecord/lib/active_record/coders/json.rb +++ b/activerecord/lib/active_record/coders/json.rb @@ -6,7 +6,7 @@ module ActiveRecord end def self.load(json) - ActiveSupport::JSON.decode(json) + ActiveSupport::JSON.decode(json) unless json.nil? end end end -- cgit v1.2.3