Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py

index b1718a630b..b939a30e19 100644
--- a/synapse/media/v1/upload_resource.py
+++ b/synapse/rest/media/v1/upload_resource.py
@@ -42,7 +42,7 @@ class UploadResource(BaseMediaResource):
     @defer.inlineCallbacks
     def _async_render_POST(self, request):
         try:
-            auth_user = yield self.auth.get_user_by_req(request)
+            auth_user, client = yield self.auth.get_user_by_req(request)
             # TODO: The checks here are a bit late. The content will have
             # already been uploaded to a tmp file at this point
             content_length = request.getHeader("Content-Length")