From 0e183475696b0f54a54e30e5918445d3995527a9 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Mon, 3 May 2010 23:50:24 +0200 Subject: [PATCH] Require delete permissions for merging/renaming pages. --- wicked/docs/CHANGES | 1 + wicked/lib/Page/MergeOrRename.php | 3 +++ wicked/templates/display/standard.inc | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wicked/docs/CHANGES b/wicked/docs/CHANGES index 3583abd1b..179515deb 100644 --- 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 f69878677..62fa95f34 100644 --- 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 6916c1967..21135390a 100644 --- 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()); -- 2.11.0