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

Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast

Browse source
This commit is contained in:
David Baker 2016-09-09 19:11:34 +01:00
commit b91e2833b3
32 changed files with 969 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/storage/event_push_actions.py
View file

@ -343,7 +343,7 @@ class EventPushActionsStore(SQLBaseStore):
def f(txn):
before_clause = ""
if before:
before_clause = "AND stream_ordering < ?"
before_clause = "AND epa.stream_ordering < ?"
args = [user_id, before, limit]
else:
args = [user_id, limit]