Test the existence of the request context key before using it for URL
Closes #15046 (grafted from 5eae02e6c094d6741d615d1c4bd2333721eb92b7) --HG-- branch : 8.0
This commit is contained in:
@@ -28,7 +28,7 @@ class URLAccessor(object):
|
|||||||
context = Transaction().context
|
context = Transaction().context
|
||||||
if context:
|
if context:
|
||||||
request = context.get('_request')
|
request = context.get('_request')
|
||||||
if request and request['is_secure']:
|
if request and request.get('is_secure'):
|
||||||
return True
|
return True
|
||||||
return bool(
|
return bool(
|
||||||
config.get('ssl', 'certificate')
|
config.get('ssl', 'certificate')
|
||||||
@@ -39,7 +39,7 @@ class URLAccessor(object):
|
|||||||
context = Transaction().context
|
context = Transaction().context
|
||||||
if context:
|
if context:
|
||||||
request = context.get('_request')
|
request = context.get('_request')
|
||||||
if request:
|
if request and 'http_host' in request:
|
||||||
return request['http_host']
|
return request['http_host']
|
||||||
return HOSTNAME
|
return HOSTNAME
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ class URLAccessor(object):
|
|||||||
context = Transaction().context
|
context = Transaction().context
|
||||||
if context:
|
if context:
|
||||||
request = context.get('_request')
|
request = context.get('_request')
|
||||||
if request:
|
if request and 'root_path' in request:
|
||||||
return request['root_path']
|
return request['root_path']
|
||||||
return ROOT_PATH
|
return ROOT_PATH
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user