IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 04:34:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling can_delete_account twice

Browse Source
This commit is contained in:
Neil Lalonde 2014-02-13 15:51:19 -05:00
parent feb4fa3bb5
commit 42fb9d4fb1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/serializers/current_user_serializer.rb
View File

@ -56,11 +56,11 @@ class CurrentUserSerializer < BasicUserSerializer
end end
def include_can_delete_account? def include_can_delete_account?
can_delete_account
end
def can_delete_account
scope.can_delete_user?(object) scope.can_delete_user?(object)
end end
def can_delete_account
true
end
end end

2
app/services/user_destroyer.rb
View File

@ -25,7 +25,7 @@ class UserDestroyer
end end
end end
end end
x = PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy
if post.topic and post.post_number == 1 if post.topic and post.post_number == 1
Topic.unscoped.where(id: post.topic.id).update_all(user_id: nil) Topic.unscoped.where(id: post.topic.id).update_all(user_id: nil)
end end