diff options
| -rw-r--r-- | app/models/setting.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index 384bb900b..763f83f62 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -100,7 +100,8 @@ class Setting < ActiveRecord::Base v = read_attribute(:value) # Unserialize serialized settings if available_settings[name]['serialized'] && v.is_a?(String) - v = YAML::load(v) + # YAML.load works as YAML.safe_load if Psych >= 4.0 is installed + v = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(v) : YAML.load(v) v = force_utf8_strings(v) end v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank? |