diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-11 14:08:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-11 14:08:29 +0100 |
| commit | 3061dac53eef21110d8d9f08554f28c562175a18 (patch) | |
| tree | 51a8cb5ed3f294887bdcc2d6ef36efcad186af07 /synapse/handlers/room.py | |
| parent | Fix check of wrong variable (diff) | |
| parent | Merge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup (diff) | |
| download | synapse-3061dac53eef21110d8d9f08554f28c562175a18.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replication_noop
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index cbd26f8f95..a7f533f7be 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -437,7 +437,7 @@ class RoomEventSource(object): logger.warn("Stream has topological part!!!! %r", from_key) from_key = "s%s" % (from_token.stream,) - app_service = yield self.store.get_app_service_by_user_id( + app_service = self.store.get_app_service_by_user_id( user.to_string() ) if app_service: |