Fixes #2672 limiting deleting pages and creating sub pages

git-svn-id: http://code.elgg.org/elgg/trunk@9170 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 10 insertions, 1 deletions

diff --git a/mod/pages/pages/pages/view.php b/mod/pages/pages/pages/view.php
index b9f1fde83..b73bc985c 100644
--- a/mod/pages/pages/pages/view.php
+++ b/mod/pages/pages/pages/view.php
@@ -33,7 +33,7 @@ $content = elgg_view_entity($page, true);
 $content .= elgg_view_comments($page);
 
 $buttons = '';
-if ($page->canEdit()) {
+if (elgg_get_logged_in_user_guid() == $page->getOwnerGuid()) {
 	$url = "pages/add/$page->guid";
 	$buttons = elgg_view('output/url', array(
 			'text' => elgg_echo('pages:newchild'),
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 2e2bc1ed6..fded5fee9 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -231,6 +231,15 @@ function pages_entity_menu_setup($hook, $type, $return, $params) {
 		return $return;
 	}
 
+	// remove delete if not owner or admin
+	if (!elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != $entity->getOwnerGuid()) {
+		foreach ($return as $index => $item) {
+			if ($item->getName() == 'delete') {
+				unset($return[$index]);
+			}
+		}
+	}
+
 	$options = array(
 		'name' => 'history',
 		'text' => elgg_echo('pages:history'),