diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-19 15:20:09 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-19 15:20:09 +0100 |
commit | f9e7493ac29f1a7474d9eeb8d1d50e3d57425768 (patch) | |
tree | c56c17762b3f1b6a60b801fed3d7ca05c8e7044e /synapse/handlers/receipts.py | |
parent | Merge branch 'master' into auth (diff) | |
parent | Remove an access token log line (diff) | |
download | synapse-f9e7493ac29f1a7474d9eeb8d1d50e3d57425768.tar.xz |
Merge branch 'develop' into auth
Diffstat (limited to 'synapse/handlers/receipts.py')
-rw-r--r-- | synapse/handlers/receipts.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py index 415dd339f6..86c911c4bf 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py @@ -171,7 +171,6 @@ class ReceiptEventSource(object): @defer.inlineCallbacks def get_new_events_for_user(self, user, from_key, limit): - defer.returnValue(([], from_key)) from_key = int(from_key) to_key = yield self.get_current_key() @@ -194,7 +193,6 @@ class ReceiptEventSource(object): @defer.inlineCallbacks def get_pagination_rows(self, user, config, key): to_key = int(config.from_key) - defer.returnValue(([], to_key)) if config.to_key: from_key = int(config.to_key) |