From e28051e3f35bcb066c313a1839d9462490bfb478 Mon Sep 17 00:00:00 2001
From: Eric Drechsel <eric@pointnineseven.com>
Date: Fri, 21 Nov 2014 13:24:57 -0800
Subject: [PATCH] only include add button in userbar if page allows subpages

---
 .../templates/wagtailadmin/userbar/item_page_add.html         | 4 ++--
 wagtail/wagtailadmin/userbar.py                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
index 45f0002e9..1a4d0a7f4 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
@@ -2,5 +2,5 @@
 {% load i18n  %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_pages_add_subpage' self.parent_page.id %}" target="_parent" class="action icon icon-plus" title="{% trans 'Add another page at this level' %}">{% trans 'Add' %}</a>
-{% endblock %}
\ No newline at end of file
+  <a href="{% url 'wagtailadmin_pages_add_subpage' self.page.id %}" target="_parent" class="action icon icon-plus" title="{% trans 'Add a child page' %}">{% trans 'Add' %}</a>
+{% endblock %}
diff --git a/wagtail/wagtailadmin/userbar.py b/wagtail/wagtailadmin/userbar.py
index 195e936b3..6ee8cda72 100644
--- a/wagtail/wagtailadmin/userbar.py
+++ b/wagtail/wagtailadmin/userbar.py
@@ -24,7 +24,7 @@ class AddPageItem(BaseItem):
             return ""
 
         # Don't render if user doesn't have ability to add siblings
-        permission_checker = self.page.get_parent().permissions_for_user(request.user)
+        permission_checker = self.page.permissions_for_user(request.user)
         if not permission_checker.can_add_subpage():
             return ""