diff options
| -rw-r--r-- | app/models/setting.rb | 22 | ||||
| -rw-r--r-- | test/unit/setting_test.rb | 16 |
2 files changed, 37 insertions, 1 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index ca280ebcd..cc4131bec 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -91,7 +91,10 @@ class Setting < ActiveRecord::Base def value v = read_attribute(:value) # Unserialize serialized settings - v = YAML::load(v) if available_settings[name]['serialized'] && v.is_a?(String) + if available_settings[name]['serialized'] && v.is_a?(String) + v = YAML::load(v) + force_utf8_strings(v) + end v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank? v end @@ -238,6 +241,23 @@ END_SRC load_plugin_settings private + + def force_utf8_strings(arg) + if arg.is_a?(String) + arg.force_encoding('UTF-8') + elsif arg.is_a?(Array) + arg.each do |a| + force_utf8_strings(a) + end + elsif arg.is_a?(Hash) + arg.each do |k,v| + force_utf8_strings(k) + force_utf8_strings(v) + end + end + arg + end + # Returns the Setting instance for the setting named name # (record found in database or new record with default value) def self.find_or_default(name) diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb index 46383e867..d2dee6d6b 100644 --- a/test/unit/setting_test.rb +++ b/test/unit/setting_test.rb @@ -1,3 +1,5 @@ +# encoding: utf-8 +# # Redmine - project management software # Copyright (C) 2006-2015 Jean-Philippe Lang # @@ -101,4 +103,18 @@ class SettingTest < ActiveSupport::TestCase assert_equal [10, 25, 50], Setting.per_page_options_array end end + + def test_serialized_setting_should_be_loaded_as_utf8_encoded_strings + scm = 'исправлено' + scm.force_encoding('BINARY') + Setting.enabled_scm = [scm] + Setting.clear_cache + + s = Setting.enabled_scm + assert_equal ['исправлено'], s + assert_equal 'UTF-8', s.first.encoding.name + ensure + Setting.where(:name => 'enabled_scm').delete_all + Setting.clear_cache + end end |