summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-09 16:11:53 +0000
committerErik Johnston <erik@matrix.org>2016-03-09 16:11:53 +0000
commitaf2fe6110c6e249ce0c679ca39bb67d2c16c59c3 (patch)
treec20ee76a3c426004bd24626e94846536f545076c /synapse
parentUse topological orders for initial sync timeline (diff)
downloadsynapse-af2fe6110c6e249ce0c679ca39bb67d2c16c59c3.tar.xz
Return the correct token form
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/stream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 613b54cd1d..c9f70a08a7 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -232,7 +232,7 @@ class StreamStore(SQLBaseStore):
             get_prev_content=True
         )
 
-        self._set_before_and_after(ret, rows, topo_order=False)
+        self._set_before_and_after(ret, rows, topo_order=from_id is None)
 
         if order.lower() == "desc":
             ret.reverse()