Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2

1 files changed, 2 insertions, 2 deletions

diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py

index 75c9a60101..9a393e2568 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -88,7 +88,7 @@ class RoomMemberStore(SQLBaseStore):
         txn.execute(sql, (user_id, room_id))
         rows = self.cursor_to_dict(txn)
         if rows:
-            return self._parse_event_from_row(rows[0])
+            return self._parse_events_txn(txn, rows)[0]
         else:
             return None
 
@@ -161,7 +161,7 @@ class RoomMemberStore(SQLBaseStore):
 
         # logger.debug("_get_members_query Got rows %s", rows)
 
-        results = [self._parse_event_from_row(r) for r in rows]
+        results = yield self._parse_events(rows)
         defer.returnValue(results)
 
     @defer.inlineCallbacks