diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 17:29:30 +0000 |
| commit | 9c61556504924a063e7739ba80122c8753aed50c (patch) | |
| tree | a483e292dfe602f30be1f9f17266a1bd0f88552d /synapse/rest/client/v1/profile.py | |
| parent | Fix Formatting (diff) | |
| parent | Merge pull request #36 from matrix-org/device_id_from_access_token (diff) | |
| download | synapse-9c61556504924a063e7739ba80122c8753aed50c.tar.xz | |
Merge branch 'develop' into client_v2_sync
Diffstat (limited to 'synapse/rest/client/v1/profile.py')
| -rw-r--r-- | synapse/rest/client/v1/profile.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py index 24f8d56952..15d6f3fc6c 100644 --- a/synapse/rest/client/v1/profile.py +++ b/synapse/rest/client/v1/profile.py @@ -37,7 +37,7 @@ class ProfileDisplaynameRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_PUT(self, request, user_id): - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) user = UserID.from_string(user_id) try: @@ -70,7 +70,7 @@ class ProfileAvatarURLRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_PUT(self, request, user_id): - auth_user = yield self.auth.get_user_by_req(request) + auth_user, client = yield self.auth.get_user_by_req(request) user = UserID.from_string(user_id) try: |