aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-01-06 05:43:14 -0800
committerYves Senn <yves.senn@gmail.com>2014-01-06 05:43:14 -0800
commitf2b80a41b5c163b32dfdd0fa797466543c6ec0e9 (patch)
tree5bdab91c538ddd338c7e4b72699f84398409abbd /activerecord/lib
parent2d1d426c675b35bc34a25c5a5960a7f0a75c520b (diff)
parent901a0c8b4a3b1de8ff1ec8feb4b67f727c07dc8b (diff)
downloadrails-f2b80a41b5c163b32dfdd0fa797466543c6ec0e9.tar.gz
rails-f2b80a41b5c163b32dfdd0fa797466543c6ec0e9.tar.bz2
rails-f2b80a41b5c163b32dfdd0fa797466543c6ec0e9.zip
Merge pull request #13593 from oliveiraethales/store_yaml_coder
Fix: ActiveRecord::Store TypeError conversion when using YAML coder
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/store.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index 186a737561..79a6ccbda0 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -178,7 +178,7 @@ module ActiveRecord
end
def load(yaml)
- self.class.as_indifferent_hash(@coder.load(yaml))
+ self.class.as_indifferent_hash(@coder.load(yaml || ''))
end
def self.as_indifferent_hash(obj)