From ad727d378100bba88ee16df38f534f1d6fd495db Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Jan 2011 19:12:35 +0000
Subject: Fixes utf8 conversions with ruby1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4605 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/helpers/attachments_helper.rb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'app/helpers/attachments_helper.rb')
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index 50b44890f..367976515 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -29,7 +29,13 @@ module AttachmentsHelper
end
def to_utf8(str)
- return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+ if str.respond_to?(:force_encoding)
+ str.force_encoding('UTF-8')
+ return str if str.valid_encoding?
+ else
+ return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+ end
+
begin
Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3]
rescue Iconv::InvalidEncoding
--
cgit v1.2.3