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

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21723 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/setting.rb b/app/models/setting.rb
index a7b7635039b9d88f39558bde82515733d977ce37..53b88bcad4627dafd03ffa4fa7554d1b10129a11 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -108,8 +108,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?