diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-12 16:17:24 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-12 16:17:24 +0000 |
| commit | 4de08a4672c62eebda2ad3ee89643c2c32242cbf (patch) | |
| tree | 1fc9e3c4ba992e6c35efb68dc9a62a7fa021295a /synapse/handlers/profile.py | |
| parent | Merge pull request #575 from matrix-org/daniel/roomcleanup (diff) | |
| download | synapse-4de08a4672c62eebda2ad3ee89643c2c32242cbf.tar.xz | |
Revert "Merge two of the room join codepaths"
This reverts commit cf81375b94c4763766440471e632fc4b103450ab. It subtly violates a guest joining auth check
Diffstat (limited to 'synapse/handlers/profile.py')
| -rw-r--r-- | synapse/handlers/profile.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 32af622733..629e6e3594 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -169,15 +169,8 @@ class ProfileHandler(BaseHandler): consumeErrors=True ).addErrback(unwrapFirstError) - if displayname is None: - del state["displayname"] - else: - state["displayname"] = displayname - - if avatar_url is None: - del state["avatar_url"] - else: - state["avatar_url"] = avatar_url + state["displayname"] = displayname + state["avatar_url"] = avatar_url defer.returnValue(None) |