Skip to content

Commit c917fa2

Browse files
committed
Merge pull request django-cms#3052 from derenio/fix_none_request_in_cmstoolbar_tag
Fix check on request.GET while request == None
2 parents 86ddc24 + 2be1893 commit c917fa2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cms/templatetags/cms_tags.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,8 @@ def render_tag(self, context, name, nodelist):
604604
toolbar = getattr(request, 'toolbar', None)
605605
if toolbar:
606606
toolbar.populate()
607-
context['cms_toolbar_login_error'] = request.GET.get('cms-toolbar-login-error', False) == '1'
607+
if request and 'cms-toolbar-login-error' in request.GET:
608+
context['cms_toolbar_login_error'] = request.GET['cms-toolbar-login-error'] == '1'
608609
context['cms_version'] = __version__
609610
if toolbar and toolbar.show_toolbar:
610611
language = toolbar.toolbar_language

0 commit comments

Comments
 (0)