zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Fix regression when suspending not from report (#8400) 

Regression from #8353
This commit is contained in:
Eugen Rochko 2018-08-23 21:51:56 +02:00 committed by GitHub
parent 7786e1357b
commit 9d58daac6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/suspensions_controller.rb
View File

@ -14,7 +14,7 @@ module Admin
@suspension = Form::AdminSuspensionConfirmation.new(suspension_params) @suspension = Form::AdminSuspensionConfirmation.new(suspension_params)
if suspension_params[:acct] == @account.acct if suspension_params[:acct] == @account.acct
resolve_report! if suspension_params[:report_id] resolve_report! if suspension_params[:report_id].present?
perform_suspend! perform_suspend!
mark_reports_resolved! mark_reports_resolved!
redirect_to admin_accounts_path redirect_to admin_accounts_path