From 0eb5d19a0c3c99e198a560d6056349a3f5ed5242 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sat, 12 Jan 2019 00:57:27 +0000
Subject: [PATCH] Import UTF-8 issue CSV files with BOM and quoted strings
 (#30412).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Felix Schäfer.


git-svn-id: http://svn.redmine.org/redmine/trunk@17786 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/import.rb           | 1 +
 test/unit/issue_import_test.rb | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/app/models/import.rb b/app/models/import.rb
index d2c53baac..71bc3c1bb 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -217,6 +217,7 @@ class Import < ActiveRecord::Base
 
     csv_options = {:headers => false}
     csv_options[:encoding] = settings['encoding'].to_s.presence || 'UTF-8'
+    csv_options[:encoding] = 'bom|UTF-8' if csv_options[:encoding] == 'UTF-8'
     separator = settings['separator'].to_s
     csv_options[:col_sep] = separator if separator.size == 1
     wrapper = settings['wrapper'].to_s
diff --git a/test/unit/issue_import_test.rb b/test/unit/issue_import_test.rb
index d4b4db69c..fe4a04872 100644
--- a/test/unit/issue_import_test.rb
+++ b/test/unit/issue_import_test.rb
@@ -116,6 +116,15 @@ class IssueImportTest < ActiveSupport::TestCase
     assert_equal 2, issues[2].parent_id
   end
 
+  def test_import_utf8_with_bom
+    import = generate_import_with_mapping('import_issues_utf8_with_bom.csv')
+    import.settings.merge!('encoding' => 'UTF-8')
+    import.save
+
+    issues = new_records(Issue,3) { import.run }
+    assert_equal 3, issues.count
+  end
+
   def test_backward_and_forward_reference_to_parent_should_work
     import = generate_import('import_subtasks.csv')
     import.settings = {