mirror of
https://github.com/meineerde/redmine.git
synced 2026-03-10 19:23:06 +00:00
Merged r21777 from trunk to 5.0-stable (#37476).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21778 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
dc003288ba
commit
db58c137a1
@ -108,7 +108,7 @@ class Setting < ActiveRecord::Base
|
||||
v = read_attribute(:value)
|
||||
# Unserialize serialized settings
|
||||
if available_settings[name]['serialized'] && v.is_a?(String)
|
||||
v = YAML.safe_load(v, permitted_classes: [Symbol, ActiveSupport::HashWithIndifferentAccess])
|
||||
v = YAML.safe_load(v, permitted_classes: Rails.configuration.active_record.yaml_column_permitted_classes)
|
||||
v = force_utf8_strings(v)
|
||||
end
|
||||
v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank?
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user