IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: do not agree flags by default when deleting posts"

Browse Source 
This reverts commit cb6fc8057b.
This commit is contained in:
Arpit Jalan
2018-11-28 10:21:11 +05:30
parent 6acabec423
commit 851ef14096
3 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/admin/flags_controller.rb
View File

@@ -86,7 +86,8 @@ class Admin::FlagsController < Admin::AdminController
restore_post = params[:action_on_post] == "restore"
if delete_post
destroy_post(post, agree_flags: true)
# PostDestroy calls PostAction.agree_flags!
destroy_post(post)
elsif restore_post
PostAction.agree_flags!(post, current_user, delete_post)
PostDestroyer.new(current_user, post).recover
@@ -137,12 +138,12 @@ class Admin::FlagsController < Admin::AdminController
private
def destroy_post(post, agree_flags: false)
def destroy_post(post)
if post.is_first_post?
topic = Topic.find_by(id: post.topic_id)
guardian.ensure_can_delete!(topic) if topic.present?
end
PostDestroyer.new(current_user, post, agree_flags: agree_flags).destroy
PostDestroyer.new(current_user, post).destroy
end
end