diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-05-25 06:50:25 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-05-25 06:50:25 +0000 |
| commit | b0e17e8199bb40d0b1bed2c3dded355f439d8b3a (patch) | |
| tree | 694b9ccde636af70a5aa515b62d1020a5eac9e62 /app/controllers/admin_controller.rb | |
| parent | a12b7bcf2931045e63093adcd765d7c6e022fa05 (diff) | |
| download | redmine-b0e17e8199bb40d0b1bed2c3dded355f439d8b3a.tar.gz redmine-b0e17e8199bb40d0b1bed2c3dded355f439d8b3a.zip | |
Don't rescue Exception class (#31387).
Patch by Go MAEDA and Pavel Rosický.
git-svn-id: http://svn.redmine.org/redmine/trunk@18197 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index eb2288eff..0a0a87eab 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -54,7 +54,7 @@ class AdminController < ApplicationController begin Redmine::DefaultData::Loader::load(params[:lang]) flash[:notice] = l(:notice_default_data_loaded) - rescue Exception => e + rescue => e flash[:error] = l(:error_can_t_load_default_data, ERB::Util.h(e.message)) end end @@ -65,7 +65,7 @@ class AdminController < ApplicationController begin Mailer.deliver_test_email(User.current) flash[:notice] = l(:notice_email_sent, ERB::Util.h(User.current.mail)) - rescue Exception => e + rescue => e flash[:error] = l(:notice_email_error, ERB::Util.h(Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup))) end redirect_to settings_path(:tab => 'notifications') |