Merged r14115 (#19305).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 00f8e52d0eebadc1de7e713a028bc9ded766e422..acf3386304a59e33ec25cd4c9db9614ce0b74afc 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -242,7 +242,7 @@ END_SRC
 private
 
   def force_utf8_strings(arg)
-    if arg.is_a?(String)
+    if arg.is_a?(String) && arg.respond_to?(:force_encoding)
       arg.dup.force_encoding('UTF-8')
     elsif arg.is_a?(Array)
       arg.map do |a|