diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-23 11:26:04 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-23 11:26:04 +0000 |
| commit | d74f0bfd5c53962e332c2dd4d30dafaa1105b92b (patch) | |
| tree | f3eaf66d67c3a87fb34340561bf188d364de623c /app/controllers/imports_controller.rb | |
| parent | 41bb302594b48152b87c92f196c915f499093bbf (diff) | |
| download | redmine-d74f0bfd5c53962e332c2dd4d30dafaa1105b92b.tar.gz redmine-d74f0bfd5c53962e332c2dd4d30dafaa1105b92b.zip | |
Merged rails-5.1 branch (#23630).
git-svn-id: http://svn.redmine.org/redmine/trunk@16859 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/imports_controller.rb')
| -rw-r--r-- | app/controllers/imports_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb index 96589ac65..661eb7405 100644 --- a/app/controllers/imports_controller.rb +++ b/app/controllers/imports_controller.rb @@ -109,9 +109,9 @@ class ImportsController < ApplicationController end def update_from_params - if params[:import_settings].is_a?(Hash) + if params[:import_settings].present? @import.settings ||= {} - @import.settings.merge!(params[:import_settings]) + @import.settings.merge!(params[:import_settings].to_unsafe_hash) @import.save! end end |