From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Mar 2015 17:41:43 +0000 (+0000)
Subject: Reverts r14067 that triggers "can't modify frozen String" errors (#19305).
X-Git-Tag: 3.1.0~215
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7c9f3b5b4364ddef2a54a1ce853415d2e3c13906;p=redmine.git

Reverts r14067 that triggers "can't modify frozen String" errors (#19305).

git-svn-id: http://svn.redmine.org/redmine/trunk@14068 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/setting.rb b/app/models/setting.rb
index cc4131bec..ca280ebcd 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -91,10 +91,7 @@ class Setting < ActiveRecord::Base
   def value
     v = read_attribute(:value)
     # Unserialize serialized settings
-    if available_settings[name]['serialized'] && v.is_a?(String)
-      v = YAML::load(v)
-      force_utf8_strings(v)
-    end
+    v = YAML::load(v) if available_settings[name]['serialized'] && v.is_a?(String)
     v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank?
     v
   end
@@ -241,23 +238,6 @@ 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 d2dee6d6b..46383e867 100644
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Redmine - project management software
 # Copyright (C) 2006-2015  Jean-Philippe Lang
 #
@@ -103,18 +101,4 @@ 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