Merge pull request django-cms#3357 from digi604/fix-3348

fixes django-cms#3348

Author: digi604

cms/templates/cms/toolbar/plugin.html

@@ -24,9 +24,9 @@
 		'onClose': {% if refresh_page %}'REFRESH_PAGE'{% else %}{% if redirect_on_close %}'{{ redirect_on_close }}'{% else %}false{% endif %}{% endif %},
 		'urls': {
 			'add_plugin': '{% if add_url %}{{ add_url }}{% else %}{% url "admin:cms_page_add_plugin" %}}{% endif %}',
-			'edit_plugin': '{% if edit_url %}{{ edit_url }}{% else %}{% url "admin:cms_page_edit_plugin" instance.pk %}{% endif %}',
+			'edit_plugin': '{% if edit_url %}{{ edit_url }}{% elif instance %}{% url "admin:cms_page_edit_plugin" instance.pk %}{% endif %}',
 			'move_plugin': '{% if move_url %}{{ move_url }}{% else %}{% url "admin:cms_page_move_plugin" %}{% endif %}',
-			'delete_plugin': '{% if delete_url %}{{ delete_url }}{% else %}{% url "admin:cms_page_delete_plugin" instance.pk %}{% endif %}',
+			'delete_plugin': '{% if delete_url %}{{ delete_url }}{% elif instance %}{% url "admin:cms_page_delete_plugin" instance.pk %}{% endif %}',
 			'copy_plugin': '{% url "admin:cms_page_copy_plugins" %}'
 		} {% endlanguage %}
 	});

cms/templatetags/cms_tags.py

@@ -359,7 +359,7 @@ def get_processors(self, context, plugin):
     def get_context(self, context, plugin):
         if not plugin:
             return {'content': ''}
-        
+
         processors=self.get_processors(context, plugin)
 
         return {'content': plugin.render_plugin(context, processors=processors)}