Skip to content

Commit 1137aa1

Browse files
authored
Escape site name on templates (#375)
1 parent 205f8cc commit 1137aa1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

djangocms_admin_style/templatetags/admin_style_tags.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
from django.conf import settings
77
from django.contrib.sites.shortcuts import get_current_site
88
from django.template.loader import render_to_string
9+
from django.utils.translation import ugettext
10+
from django.template.defaultfilters import conditional_escape
911

1012

1113
# We follow the Semantic versioning convention
@@ -19,8 +21,14 @@
1921
@register.simple_tag(takes_context=True)
2022
def current_site_name(context):
2123
request = context.get('request')
22-
site = get_current_site(request)
23-
return site.name
24+
25+
try:
26+
site_name = get_current_site(request).name
27+
except AttributeError:
28+
# This happens if request is None
29+
# and sites framework is not in INSTALLED_APPS
30+
site_name = ugettext('my site')
31+
return conditional_escape(site_name)
2432

2533

2634
@register.simple_tag(takes_context=True)

0 commit comments

Comments
 (0)