diff options
| author | Neil Johnson <neil@matrix.org> | 2018-10-04 17:26:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 17:26:59 +0100 |
| commit | ed82043efb5456dc03a6a9969b7e4f3f941a6c67 (patch) | |
| tree | 5c2b73172bc4deefb9efb6de8c8e59cc184d1263 /synapse/handlers/sync.py | |
| parent | move logic into register, fix room alias localpart bug, tests (diff) | |
| parent | Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers (diff) | |
| download | synapse-ed82043efb5456dc03a6a9969b7e4f3f941a6c67.tar.xz | |
Merge branch 'develop' into matthew/autocreate_autojoin
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index c7d69d9d80..67b8ca28c7 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -567,13 +567,13 @@ class SyncHandler(object): # be a valid name or canonical_alias - i.e. we're checking that they # haven't been "deleted" by blatting {} over the top. if name_id: - name = yield self.store.get_event(name_id, allow_none=False) + name = yield self.store.get_event(name_id, allow_none=True) if name and name.content: defer.returnValue(summary) if canonical_alias_id: canonical_alias = yield self.store.get_event( - canonical_alias_id, allow_none=False, + canonical_alias_id, allow_none=True, ) if canonical_alias and canonical_alias.content: defer.returnValue(summary) |