From eabda2f745396741061474a09727b7bc4a8eb045 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 15 Mar 2015 20:26:34 +0000 Subject: [PATCH] Merged r14115 (#19305). git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/setting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/setting.rb b/app/models/setting.rb index 00f8e52d0..acf338630 100644 --- 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| -- 2.39.5