diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-01-12 01:31:15 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-01-12 01:31:15 +0000 |
| commit | 9f19b7a148852cede1aeec299244d4564035ca71 (patch) | |
| tree | 9cff21b5872af96df578cef32c5596a712d7e303 /app | |
| parent | 77dbedc37f610547e385cd666be138aa2000a1c9 (diff) | |
| download | redmine-9f19b7a148852cede1aeec299244d4564035ca71.tar.gz redmine-9f19b7a148852cede1aeec299244d4564035ca71.zip | |
Merged r17786 and r17787 from trunk to 4.0-stable (#30412).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17788 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/import.rb | 1 |
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 |