diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-27 17:16:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-27 17:16:24 +0000 |
| commit | 5e26f6f3ae12d343bd2e1ba9b1b27fc1f7991fde (patch) | |
| tree | 288cb19c083b7bc8c7d6ca4b5eed2f8484421bbf /synapse/storage/stream.py | |
| parent | Add a workaround for bug where some initial join events don't reference creat... (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-5e26f6f3ae12d343bd2e1ba9b1b27fc1f7991fde.tar.xz | |
Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse v0.5.3
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index b84735e61c..3405cb365e 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -283,7 +283,7 @@ class StreamStore(SQLBaseStore): sql = ( "SELECT *, (%(redacted)s) AS redacted FROM events " - "WHERE room_id = ? AND stream_ordering <= ? " + "WHERE room_id = ? AND stream_ordering <= ? AND outlier = 0 " "ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ? " ) % { "redacted": del_sql, |