Merge remote-tracking branch 'origin/develop' into test-sqlite-memory

This commit is contained in:
Paul "LeoNerd" Evans 2014-09-15 14:15:10 +01:00
commit b0406b9ead
44 changed files with 269 additions and 108 deletions

View file

@ -66,8 +66,8 @@ class RoomMemberStore(SQLBaseStore):
# Check if this was the last person to have left.
member_events = self._get_members_query_txn(
txn,
where_clause="c.room_id = ? AND m.membership = ?",
where_values=(event.room_id, Membership.JOIN,)
where_clause="c.room_id = ? AND m.membership = ? AND m.user_id != ?",
where_values=(event.room_id, Membership.JOIN, target_user_id,)
)
joined_domains = set()