diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-05-27 08:40:39 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-05-27 08:40:39 +0000 |
| commit | ccb9d4ada9bdf2c24754f0dcf6608d8a3f7e895b (patch) | |
| tree | 4074ac9da706962ff3a66a047a4ea72048740a1c /app/controllers | |
| parent | 86fa4e66c9971dd7f399bba18798792550402706 (diff) | |
| download | redmine-ccb9d4ada9bdf2c24754f0dcf6608d8a3f7e895b.tar.gz redmine-ccb9d4ada9bdf2c24754f0dcf6608d8a3f7e895b.zip | |
Rescue any EncodingError exceptions (#25861).
git-svn-id: http://svn.redmine.org/redmine/trunk@16572 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/imports_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb index fb87c9bc8..2ec918e6c 100644 --- a/app/controllers/imports_controller.rb +++ b/app/controllers/imports_controller.rb @@ -52,7 +52,7 @@ class ImportsController < ApplicationController rescue CSV::MalformedCSVError => e flash.now[:error] = l(:error_invalid_csv_file_or_settings) - rescue ArgumentError, Encoding::InvalidByteSequenceError => e + rescue ArgumentError, EncodingError => e flash.now[:error] = l(:error_invalid_file_encoding, :encoding => ERB::Util.h(@import.settings['encoding'])) rescue SystemCallError => e flash.now[:error] = l(:error_can_not_read_import_file) |