diff options
| author | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-10-14 15:10:38 +0100 |
| commit | bcb1245a2d4746d539ef60b9ca40e7ad16056efa (patch) | |
| tree | c5927411c6d329bbabbf3e41f8d98cda588b24ff /synapse/storage | |
| parent | Make password reset email field case insensitive (diff) | |
| parent | Merge pull request #1169 from matrix-org/erikj/fix_email_notifs (diff) | |
| download | synapse-bcb1245a2d4746d539ef60b9ca40e7ad16056efa.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/password_reset_case_insensitive
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/room.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 2ef13d7403..11813b44f6 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -320,6 +320,9 @@ class RoomStore(SQLBaseStore): txn.execute(sql, (prev_id, current_id, limit,)) return txn.fetchall() + if prev_id == current_id: + return defer.succeed([]) + return self.runInteraction( "get_all_new_public_rooms", get_all_new_public_rooms ) |