diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-10 18:24:43 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-10 18:25:42 +0000 |
| commit | a8e565eca8cbfcedbdfd812c98a6545c2fc31afd (patch) | |
| tree | d55fba621e45804cd27829415b0e588b7e9fa51c /synapse/handlers | |
| parent | Fix rest.test_events. Convert to use SQLiteMemoryDbPool (diff) | |
| download | synapse-a8e565eca8cbfcedbdfd812c98a6545c2fc31afd.tar.xz | |
Add an EventValidator. Fix bugs in auth ++ storage
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/profile.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index e47814483a..834b37f5f3 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -152,10 +152,13 @@ class ProfileHandler(BaseHandler): if not user.is_mine: defer.returnValue(None) - (displayname, avatar_url) = yield defer.gatherResults([ - self.store.get_profile_displayname(user.localpart), - self.store.get_profile_avatar_url(user.localpart), - ]) + (displayname, avatar_url) = yield defer.gatherResults( + [ + self.store.get_profile_displayname(user.localpart), + self.store.get_profile_avatar_url(user.localpart), + ], + consumeErrors=True + ) state["displayname"] = displayname state["avatar_url"] = avatar_url |