Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 19:34:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge two of the room join codepaths"

Browse source 
This reverts commit cf81375b94.

It subtly violates a guest joining auth check
This commit is contained in:
Daniel Wagner-Hall 2016-02-12 16:17:24 +00:00
parent d7aa103f00
commit 4de08a4672
5 changed files with 69 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/profile.py
View file

@ -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)