diff options
author | hera <matrix@hera.matrix.org> | 2018-11-08 11:03:08 +0000 |
---|---|---|
committer | hera <matrix@hera.matrix.org> | 2018-11-08 11:03:39 +0000 |
commit | 5c0c4b4079b43e6929cca19de63b580cb6863f06 (patch) | |
tree | 6d38b75789c3930bbea7b2f376c9ef681dae47d2 | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
download | synapse-5c0c4b4079b43e6929cca19de63b580cb6863f06.tar.xz |
Fix encoding error for consent form on python3
The form was rendering this as "b'01234....'". -- richvdh
-rw-r--r-- | synapse/rest/consent/consent_resource.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/consent/consent_resource.py b/synapse/rest/consent/consent_resource.py index e0f7de5d5c..8009b7ff1c 100644 --- a/synapse/rest/consent/consent_resource.py +++ b/synapse/rest/consent/consent_resource.py @@ -160,7 +160,9 @@ class ConsentResource(Resource): try: self._render_template( request, "%s.html" % (version,), - user=username, userhmac=userhmac, version=version, + user=username, + userhmac=userhmac.decode('ascii'), + version=version, has_consented=has_consented, public_version=public_version, ) except TemplateNotFound: |