summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-01-12 00:57:27 +0000
committerGo MAEDA <maeda@farend.jp>2019-01-12 00:57:27 +0000
commit0eb5d19a0c3c99e198a560d6056349a3f5ed5242 (patch)
treed9bac3592546e87af05b8a9b0716897a6c16f1fc /app
parentbce44769ffe8286d7b256370656e718cae7e2272 (diff)
downloadredmine-0eb5d19a0c3c99e198a560d6056349a3f5ed5242.tar.gz
redmine-0eb5d19a0c3c99e198a560d6056349a3f5ed5242.zip
Import UTF-8 issue CSV files with BOM and quoted strings (#30412).
Patch by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/trunk@17786 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/import.rb1
1 files changed, 1 insertions, 0 deletions
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