Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-09-02 04:47:26 +02:00
Code Issues Packages Projects Releases Activity

Merged r21722 from trunk to 4.2-stable (#37450).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/4.2-stable@21724 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2022-07-20 04:43:09 +00:00
parent c5fc9398d5
commit 562122d82e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/setting.rb
View File

@@ -105,8 +105,7 @@ class Setting < ActiveRecord::Base
v = read_attribute(:value)
# Unserialize serialized settings
if available_settings[name]['serialized'] && v.is_a?(String)
# 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 = YAML.safe_load(v, permitted_classes: [ActiveSupport::HashWithIndifferentAccess])
v = force_utf8_strings(v)
end
v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank?