Remove duplicate slashes in generated consent URLs

This commit is contained in:
Travis Ralston 2018-11-15 20:41:53 -07:00 committed by Andrew Morgan
parent e0581ccf0e
commit 8d98c4e3e3
2 changed files with 3 additions and 3 deletions

View file

@ -473,7 +473,7 @@ class AuthHandler(BaseHandler):
"version": self.hs.config.user_consent_version, "version": self.hs.config.user_consent_version,
"en": { "en": {
"name": self.hs.config.user_consent_policy_name, "name": self.hs.config.user_consent_policy_name,
"url": "%s/_matrix/consent?v=%s" % ( "url": "%s_matrix/consent?v=%s" % (
self.hs.config.public_baseurl, self.hs.config.public_baseurl,
self.hs.config.user_consent_version, self.hs.config.user_consent_version,
), ),

View file

@ -161,7 +161,7 @@ class AuthRestServlet(RestServlet):
html = TERMS_TEMPLATE % { html = TERMS_TEMPLATE % {
'session': session, 'session': session,
'terms_url': "%s/_matrix/consent?v=%s" % ( 'terms_url': "%s_matrix/consent?v=%s" % (
self.hs.config.public_baseurl, self.hs.config.public_baseurl,
self.hs.config.user_consent_version, self.hs.config.user_consent_version,
), ),
@ -242,7 +242,7 @@ class AuthRestServlet(RestServlet):
else: else:
html = TERMS_TEMPLATE % { html = TERMS_TEMPLATE % {
'session': session, 'session': session,
'terms_url': "%s/_matrix/consent?v=%s" % ( 'terms_url': "%s_matrix/consent?v=%s" % (
self.hs.config.public_baseurl, self.hs.config.public_baseurl,
self.hs.config.user_consent_version, self.hs.config.user_consent_version,
), ),