summary refs log tree commit diff
path: root/synapse/storage/profile.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-08-25 16:48:58 +0100
committerGitHub <noreply@github.com>2017-08-25 16:48:58 +0100
commit7f0d0ba3bcd3aa56cab0d16346e99ed6a60cc9eb (patch)
tree62e646b2c99919f1acb2c4eb21d25d4dd701685a /synapse/storage/profile.py
parentMerge pull request #2429 from matrix-org/erikj/groups_profile_cache (diff)
parentAdd user profiles to summary from group server (diff)
downloadsynapse-7f0d0ba3bcd3aa56cab0d16346e99ed6a60cc9eb.tar.xz
Merge pull request #2430 from matrix-org/erikj/groups_profile_cache
Add user profiles to summary from group server
Diffstat (limited to 'synapse/storage/profile.py')
-rw-r--r--synapse/storage/profile.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py

index dca6af8a77..beea3102fc 100644 --- a/synapse/storage/profile.py +++ b/synapse/storage/profile.py
@@ -62,7 +62,7 @@ class ProfileStore(SQLBaseStore): return self._simple_select_one( table="remote_profile_cache", keyvalues={"user_id": user_id}, - retcols=("displayname", "avatar_url", "last_check"), + retcols=("displayname", "avatar_url",), allow_none=True, desc="get_from_remote_profile_cache", )