diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
| commit | 729ea933ea4a02430002d5055483c3ea34538578 (patch) | |
| tree | 2064ec885655d444c4d155b1132f845176b36ec4 /synapse/rest/client/v1/profile.py | |
| parent | Implement basic pagination for search results (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-729ea933ea4a02430002d5055483c3ea34538578.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
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 fdde88a60d..6b379e4e5f 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, _, _ = 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, _, _ = yield self.auth.get_user_by_req(request) user = UserID.from_string(user_id) try: |