From 24b1f2bbc439dd06fc933b392e925a738ff34f06 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 31 Jul 2018 23:03:17 +0530 Subject: [PATCH] Pick port from webserver_port in get_url --- frappe/utils/data.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 672a004d64..6cd6dbec0b 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -713,8 +713,10 @@ def get_url(uri=None, full_address=False): if not uri and full_address: uri = frappe.get_request_header("REQUEST_URI", "") - if frappe.conf.http_port: - host_name = host_name + ':' + str(frappe.conf.http_port) + port = frappe.conf.http_port or frappe.conf.webserver_port + + if host_name and ':' not in host_name and port: + host_name = host_name + ':' + str(port) url = urljoin(host_name, uri) if uri else host_name