summaryrefslogtreecommitdiffstats
path: root/app/models/attachment.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-06 09:31:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-06 09:31:29 +0000
commitb4975862d66c6b5d7db10881685d44f766a2a76c (patch)
tree616261dcd5bdb9a86ab3c0df2de8bad82289aef4 /app/models/attachment.rb
parent331cf233457a1c7a8d1cd7027d2424fbdb2be7d4 (diff)
downloadredmine-b4975862d66c6b5d7db10881685d44f766a2a76c.tar.gz
redmine-b4975862d66c6b5d7db10881685d44f766a2a76c.zip
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
Diffstat (limited to 'app/models/attachment.rb')
-rw-r--r--app/models/attachment.rb1
1 files changed, 1 insertions, 0 deletions
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