diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
| commit | dab846568de09742c038a9a5a5ed00539ff5aa38 (patch) | |
| tree | ef4220faa96569d1d8d5f386c92bb4df2655eeed /synapse/http/site.py | |
| parent | Add changelog (diff) | |
| parent | Keep track when we try and fail to process a pulled event (#13589) (diff) | |
| download | synapse-madlittlemods/event_id_always_failed_to_fetch.tar.xz | |
Merge branch 'develop' into madlittlemods/event_id_always_failed_to_fetch madlittlemods/event_id_always_failed_to_fetch
Conflicts: synapse/handlers/federation_event.py
Diffstat (limited to 'synapse/http/site.py')
| -rw-r--r-- | synapse/http/site.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py index eeec74b78a..1155f3f610 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -226,7 +226,7 @@ class SynapseRequest(Request): # If this is a request where the target user doesn't match the user who # authenticated (e.g. and admin is puppetting a user) then we return both. - if self._requester.user.to_string() != authenticated_entity: + if requester != authenticated_entity: return requester, authenticated_entity return requester, None |