Require delete permissions for merging/renaming pages.

diff --git a/wicked/docs/CHANGES b/wicked/docs/CHANGES
index 3583abd..179515d 100644 (file)
--- a/wicked/docs/CHANGES
+++ b/wicked/docs/CHANGES
@@ -2,6 +2,7 @@
 v1.0-cvs
 --------
 
+[jan] Require delete permissions for merging/renaming pages.
 [jan] Don't use WikiWords in menus (Request #7021).
 [jan] Drop support for coWiki markup.
 [jan] Fix Oracle SQL scripts.

diff --git a/wicked/lib/Page/MergeOrRename.php b/wicked/lib/Page/MergeOrRename.php
index f698786..62fa95f 100644 (file)
--- a/wicked/lib/Page/MergeOrRename.php
+++ b/wicked/lib/Page/MergeOrRename.php
@@ -56,6 +56,9 @@ class MergeOrRename extends Page {
     function allows($mode)
     {
         if ($mode == WICKED_MODE_EDIT) {
+            if (!parent::allows(WICKED_MODE_REMOVE)) {
+                return false;
+            }
             $page = Page::getPage($this->referrer());
             if ($page->isLocked(Wicked::lockUser())) {
                 return false;

diff --git a/wicked/templates/display/standard.inc b/wicked/templates/display/standard.inc
index 6916c19..2113539 100644 (file)
--- a/wicked/templates/display/standard.inc
+++ b/wicked/templates/display/standard.inc
@@ -56,7 +56,7 @@ if ($this->allows(WICKED_MODE_REMOVE)) {
                        'widget', '', '', _("_Delete"));
 }
 
-if ($this->allows(WICKED_MODE_EDIT) && !$this->isLocked(Wicked::lockUser())) {
+if ($this->allows(WICKED_MODE_REMOVE) && !$this->isLocked(Wicked::lockUser())) {
     separator();
     $url = Horde_Util::addParameter(Wicked::url('MergeOrRename'),
                               'referrer', $this->pageName());