summary refs log tree commit diff
path: root/synapse/rest/client/v1/admin.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-06-22 16:35:37 +0100
committerRichard van der Hoff <richard@matrix.org>2018-06-22 16:35:37 +0100
commit6d6ea1bb40cbcb1669ffe62dc1975230e025ed28 (patch)
treec134b4574a3413f4ec2b5e2fe037d9d0413632e1 /synapse/rest/client/v1/admin.py
parentSend HTTP pushes direct to http-priv rather than via clouldflare (diff)
parentRevert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" (diff)
downloadsynapse-6d6ea1bb40cbcb1669ffe62dc1975230e025ed28.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r--synapse/rest/client/v1/admin.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py

index e4036eaa0c..9890aed577 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py
@@ -254,9 +254,7 @@ class DeactivateAccountRestServlet(ClientV1RestServlet): if not is_admin: raise AuthError(403, "You are not a server admin") - yield self._deactivate_account_handler.deactivate_account( - target_user_id, False, - ) + yield self._deactivate_account_handler.deactivate_account(target_user_id) defer.returnValue((200, {}))