diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-06-03 12:14:18 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-06-03 12:14:18 +0100 |
| commit | 8d740132f499b2c232716533ea786dfffacc1ec8 (patch) | |
| tree | 5034a5aba0c6e604683080357ae6481803a4dea1 /synapse/handlers/sync.py | |
| parent | brand the email from header (diff) | |
| parent | Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-8d740132f499b2c232716533ea786dfffacc1ec8.tar.xz | |
Merge branch 'develop' into matthew/brand-from-header
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 5307b62b85..be26a491ff 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -198,9 +198,8 @@ class SyncHandler(object): @defer.inlineCallbacks def push_rules_for_user(self, user): user_id = user.to_string() - rawrules = yield self.store.get_push_rules_for_user(user_id) - enabled_map = yield self.store.get_push_rules_enabled_for_user(user_id) - rules = format_push_rules_for_user(user, rawrules, enabled_map) + rules = yield self.store.get_push_rules_for_user(user_id) + rules = format_push_rules_for_user(user, rules) defer.returnValue(rules) @defer.inlineCallbacks |