diff options
| author | Go MAEDA <maeda@farend.jp> | 2022-02-09 01:20:00 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2022-02-09 01:20:00 +0000 |
| commit | 50e9988a60677f6a2cb6d424fb454e0551412a0c (patch) | |
| tree | a8c600b03f249708b1fc99dcbfdc94aecfbaa3d0 | |
| parent | 6f6c990f20734c0de2262a1bc41c05c42d4aeca0 (diff) | |
| download | redmine-50e9988a60677f6a2cb6d424fb454e0551412a0c.tar.gz redmine-50e9988a60677f6a2cb6d424fb454e0551412a0c.zip | |
Merged r21294 from trunk to 4.1-stable (#36226).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21406 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -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? |