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/media/v0 | |
| 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/media/v0')
| -rw-r--r-- | synapse/rest/media/v0/content_repository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index c28dc86cd7..e4fa8c4647 100644 --- a/synapse/rest/media/v0/content_repository.py +++ b/synapse/rest/media/v0/content_repository.py @@ -66,7 +66,7 @@ class ContentRepoResource(resource.Resource): @defer.inlineCallbacks def map_request_to_name(self, request): # auth the user - auth_user, _ = yield self.auth.get_user_by_req(request) + auth_user, _, _ = yield self.auth.get_user_by_req(request) # namespace all file uploads on the user prefix = base64.urlsafe_b64encode( |