diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-20 14:18:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-20 14:18:04 +0100 |
| commit | bc72d381b2d5322982204bb214453e2af56f70d5 (patch) | |
| tree | 4f6932f9a32e5e25b80e8202be75d04e50a9686e /synapse/storage/account_data.py | |
| parent | point to the CAPTCHA docs (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-bc72d381b2d5322982204bb214453e2af56f70d5.tar.xz | |
Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1
Diffstat (limited to 'synapse/storage/account_data.py')
| -rw-r--r-- | synapse/storage/account_data.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/account_data.py b/synapse/storage/account_data.py index ec7e8d40d2..3fa226e92d 100644 --- a/synapse/storage/account_data.py +++ b/synapse/storage/account_data.py @@ -138,6 +138,9 @@ class AccountDataStore(SQLBaseStore): A deferred pair of lists of tuples of stream_id int, user_id string, room_id string, type string, and content string. """ + if last_room_id == current_id and last_global_id == current_id: + return defer.succeed(([], [])) + def get_updated_account_data_txn(txn): sql = ( "SELECT stream_id, user_id, account_data_type, content" |