diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-23 16:55:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-23 16:55:29 +0000 |
| commit | 7a3815b372552e516cc3619c4ea143f610358206 (patch) | |
| tree | 8ff286640cbc715ae82f7c13fcadfed218373070 /synapse/push/__init__.py | |
| parent | English (diff) | |
| parent | Merge pull request #666 from matrix-org/erikj/intern (diff) | |
| download | synapse-7a3815b372552e516cc3619c4ea143f610358206.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0
Diffstat (limited to 'synapse/push/__init__.py')
| -rw-r--r-- | synapse/push/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 65ef1b68a3..296c4447ec 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -317,7 +317,7 @@ class Pusher(object): @defer.inlineCallbacks def _get_badge_count(self): invites, joins = yield defer.gatherResults([ - self.store.get_invites_for_user(self.user_id), + self.store.get_invited_rooms_for_user(self.user_id), self.store.get_rooms_for_user(self.user_id), ], consumeErrors=True) |