From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 12 Feb 2011 09:51:43 +0000 (+0000)
Subject: Merged r4816 from trunk.
X-Git-Tag: 1.1.2~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=008d38d6b45fb5f72dd08299bda028b7f41f6fbe;p=redmine.git

Merged r4816 from trunk.

scm: fix non ASCII filename downloaded from repo is broken on Internet Explorer.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4819 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 8bd323646..095e82092 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -123,7 +123,7 @@ class RepositoriesController < ApplicationController
     (show_error_not_found; return) unless @content
     if 'raw' == params[:format] || @content.is_binary_data? || (@entry.size && @entry.size > Setting.file_max_size_displayed.to_i.kilobyte)
       # Force the download
-      send_data @content, :filename => @path.split('/').last
+      send_data @content, :filename => filename_for_content_disposition(@path.split('/').last)
     else
       # Prevent empty lines when displaying a file with Windows style eol
       @content.gsub!("\r\n", "\n")