Merge f4f0ee7 into d19a54a

django-cms · Dec 15, 2015 · 486b8ab · 486b8ab
2 parents d19a54a + f4f0ee7
commit 486b8ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -1318,7 +1318,7 @@ def resolve(self, request):
                     except:
                         obj = None
         if obj:
-            if not request.toolbar or not request.toolbar.edit_mode:
+            if not getattr(request, 'toolbar', False) or not getattr(request.toolbar, 'edit_mode', False):
                 if isinstance(obj, Page):
                     if obj.get_public_object():
                         url = obj.get_public_object().get_absolute_url()

diff --git a/docs/reference/configuration.rst b/docs/reference/configuration.rst
@@ -922,7 +922,8 @@ CMS_TOOLBAR_HIDE
 default
     ``False``
 
-If True, the toolbar is hidden in the pages out django CMS.
+If ``True``, the toolbar is hidden, even on CMS pages.
+
 To determine the internal url of django cms, you need to assign CMS_APP_NAME to use when you include ``'cms.urls'``
 
 Example::