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

FIX: validate topic deletion when acting on a flag

Browse Source
This commit is contained in:
Arpit Jalan
2018-11-23 19:28:04 +05:30
parent ed400a90fe
commit b5bf182ad5
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ class Admin::FlagsController < Admin::AdminController
if delete_post
# PostDestroy calls PostAction.agree_flags!
PostDestroyer.new(current_user, post).destroy
destroy_post(post)
elsif restore_post
PostAction.agree_flags!(post, current_user, delete_post)
PostDestroyer.new(current_user, post).recover
@@ -131,9 +131,19 @@ class Admin::FlagsController < Admin::AdminController
)
PostAction.defer_flags!(post, current_user, params[:delete_post])
PostDestroyer.new(current_user, post).destroy if params[:delete_post]
destroy_post(post) if params[:delete_post]
render body: nil
end
private
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).destroy
end
end