summary refs log tree commit diff
path: root/synapse/rest/client/v1/admin.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 14:37:13 +0100
commit4c22c9b0b6d857512c66ec6fdc03e383b8c47af3 (patch)
treeeb406b0cf027fcc7f9db1d67c9999f65ac8b6140 /synapse/rest/client/v1/admin.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3441 from matrix-org/erikj/redo_erasure (diff)
downloadsynapse-4c22c9b0b6d857512c66ec6fdc03e383b8c47af3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse 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, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py

index 9890aed577..e4036eaa0c 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py
@@ -254,7 +254,9 @@ 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) + yield self._deactivate_account_handler.deactivate_account( + target_user_id, False, + ) defer.returnValue((200, {}))