From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Apr 2012 09:31:29 +0000 (+0000)
Subject: Uploading of attachments which filename contains non-ASCII chars fails with Ruby... 
X-Git-Tag: 1.4.0~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b4975862d66c6b5d7db10881685d44f766a2a76c;p=redmine.git

Uploading of attachments which filename contains non-ASCII chars fails with Ruby 1.9 on issue update (#10575).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9334 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index c9c33e3d4..a6351da67 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -78,6 +78,7 @@ class Attachment < ActiveRecord::Base
       if @temp_file.size > 0
         if @temp_file.respond_to?(:original_filename)
           self.filename = @temp_file.original_filename
+          self.filename.force_encoding("UTF-8") if filename.respond_to?(:force_encoding)
         end
         if @temp_file.respond_to?(:content_type)
           self.content_type = @temp_file.content_type.to_s.chomp