diff options
| author | Thales Oliveira <oliveiraethales@gmail.com> | 2014-01-05 20:55:02 -0200 |
|---|---|---|
| committer | Thales Oliveira <oliveiraethales@gmail.com> | 2014-01-06 11:36:19 -0200 |
| commit | 901a0c8b4a3b1de8ff1ec8feb4b67f727c07dc8b (patch) | |
| tree | 70a52311aec61c1fb8f9233009cbe43439eca122 /activerecord/lib/active_record | |
| parent | 3a48b83e5eec62a5d2bfab1a118c24b45345388c (diff) | |
| download | rails-901a0c8b4a3b1de8ff1ec8feb4b67f727c07dc8b.tar.gz rails-901a0c8b4a3b1de8ff1ec8feb4b67f727c07dc8b.tar.bz2 rails-901a0c8b4a3b1de8ff1ec8feb4b67f727c07dc8b.zip | |
Fix: ActiveRecord::Store TypeError conversion when using YAML coder
Renaming the test accordingly to its behaviour
Adding 'Fixes' statement to changelog
Improving tests legibility & changelog
Undoing mistakenly removed empty line & further improving changelog
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/store.rb | 2 |
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) |