From 500f213c6b8b85d6a994fa5f396712edf9c458f6 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 12 Nov 2021 09:29:55 -0500 Subject: [PATCH] Fix erroneous merge resolution --- netbox/utilities/templatetags/helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index cc60b0ec0..9499845b6 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -15,6 +15,7 @@ from django.utils.html import strip_tags from django.utils.safestring import mark_safe from markdown import markdown +from netbox.config import get_config from utilities.forms import get_selected_values, TableConfigForm from utilities.utils import foreground_color @@ -41,7 +42,7 @@ def render_markdown(value): """ Render text as Markdown """ - schemes = '|'.join(settings.ALLOWED_URL_SCHEMES) + schemes = '|'.join(get_config().ALLOWED_URL_SCHEMES) # Strip HTML tags value = strip_tags(value)