mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-24 09:28:38 -06:00
Fix erroneous merge resolution
This commit is contained in:
parent
cede27b5fe
commit
500f213c6b
@ -15,6 +15,7 @@ from django.utils.html import strip_tags
|
|||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from markdown import markdown
|
from markdown import markdown
|
||||||
|
|
||||||
|
from netbox.config import get_config
|
||||||
from utilities.forms import get_selected_values, TableConfigForm
|
from utilities.forms import get_selected_values, TableConfigForm
|
||||||
from utilities.utils import foreground_color
|
from utilities.utils import foreground_color
|
||||||
|
|
||||||
@ -41,7 +42,7 @@ def render_markdown(value):
|
|||||||
"""
|
"""
|
||||||
Render text as Markdown
|
Render text as Markdown
|
||||||
"""
|
"""
|
||||||
schemes = '|'.join(settings.ALLOWED_URL_SCHEMES)
|
schemes = '|'.join(get_config().ALLOWED_URL_SCHEMES)
|
||||||
|
|
||||||
# Strip HTML tags
|
# Strip HTML tags
|
||||||
value = strip_tags(value)
|
value = strip_tags(value)
|
||||||
|
Loading…
Reference in New Issue
Block a user