Merged r14115 (#19305).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-03-15 20:26:34 +00:00
parent 2bfeaf886e
commit eabda2f745

View File

@@ -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|