summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-12 13:44:46 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-12 13:44:46 +0000
commit473a239d83aa6551fde6565a5c024a9b73777427 (patch)
treefa6d7865bb8cf34e7486c6b28b4fb61e3b6f39dc /synapse/rest/client/v1
parentMerge pull request #363 from matrix-org/daniel/guestscanjoin (diff)
parentAllow guests to set their display names (diff)
downloadsynapse-473a239d83aa6551fde6565a5c024a9b73777427.tar.xz
Merge pull request #364 from matrix-org/daniel/guestdisplaynames
Allow guests to set their display names

Depends: https://github.com/matrix-org/synapse/pull/363
Tests in https://github.com/matrix-org/sytest/pull/66
Diffstat (limited to 'synapse/rest/client/v1')
-rw-r--r--synapse/rest/client/v1/profile.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py
index 6b379e4e5f..3218e47025 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, allow_guest=True)
         user = UserID.from_string(user_id)
 
         try: