Permalink
Browse files

Merge branch 'bug_622' of https://github.com/fivethreeo/django-cms in…

…to fivethreeo-bug_622
  • Loading branch information...
2 parents ebbc566 + 2b3f341 commit bc7086d1556bfc3189f0de7724bad2f9c473f1ad Jonas Obrist committed Dec 24, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 cms/templates/cms/toolbar/toolbar.html
@@ -158,7 +158,7 @@
{% endif %}
</div>
<div id="cms_toolbar_col2">
- {% if edit %}
+ {% if edit and page %}
{% if auth %}
{% if moderator_should_approve and has_moderate_permission %}
<a id="cms_toolbar_approvebutton" href="{% url admin:cms_page_approve_page page.pk %}" class="button green" title="{% trans 'Approve directly' %}">

0 comments on commit bc7086d

Please sign in to comment.