diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-03-19 16:12:40 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-03-19 16:12:40 +0100 |
| commit | 592d6305fda97ceda92a8ce6079a9fdbe9928567 (patch) | |
| tree | 7a0edf2be5f22754bf8da194a1412d740ef0a004 /synapse/rest/admin | |
| parent | Fix lint (diff) | |
| parent | fix mypy (diff) | |
| download | synapse-592d6305fda97ceda92a8ce6079a9fdbe9928567.tar.xz | |
Merge branch 'develop' into babolivier/msc3026
Diffstat (limited to 'synapse/rest/admin')
| -rw-r--r-- | synapse/rest/admin/users.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py index 2c89b62e25..aaa56a7024 100644 --- a/synapse/rest/admin/users.py +++ b/synapse/rest/admin/users.py @@ -271,7 +271,7 @@ class UserRestServletV2(RestServlet): elif not deactivate and user["deactivated"]: if ( "password" not in body - and self.hs.config.password_localdb_enabled + and self.auth_handler.can_change_password() ): raise SynapseError( 400, "Must provide a password to re-activate an account." |