diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
| commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/controllers/admin/suspensions_controller.rb | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) | |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/suspensions_controller.rb')
| -rw-r--r-- | app/controllers/admin/suspensions_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/suspensions_controller.rb b/app/controllers/admin/suspensions_controller.rb index 0c7bdad9e..f9bbf36fb 100644 --- a/app/controllers/admin/suspensions_controller.rb +++ b/app/controllers/admin/suspensions_controller.rb @@ -14,7 +14,7 @@ module Admin @suspension = Form::AdminSuspensionConfirmation.new(suspension_params) if suspension_params[:acct] == @account.acct - resolve_report! if suspension_params[:report_id] + resolve_report! if suspension_params[:report_id].present? perform_suspend! mark_reports_resolved! redirect_to admin_accounts_path |