From: Cash Costello <cash.costello@gmail.com>
Date: Mon, 9 Jul 2012 23:38:24 +0000 (-0400)
Subject: Refs #4631 $object->canEdit() check not necessary and added a confirm popup on delete... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5d9a8f414432e575b185c30b8e9764ab18f13ccd;p=lorea%2Felgg.git

Refs #4631 $object->canEdit() check not necessary and added a confirm popup on delete to prevent accidental deletes
---

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 61d283f4b..10b11acfe 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -336,15 +336,16 @@ function elgg_river_menu_setup($hook, $type, $return, $params) {
 			}
 		}
 		
-		if ($object->canEdit() && elgg_is_admin_logged_in()) {
+		if (elgg_is_admin_logged_in()) {
 			$options = array(
-					'name' => 'delete',
-					'href' => "action/river/delete?id=$item->id",
-					'text' => elgg_view_icon('delete'),
-					'title' => elgg_echo('delete'),
-					'is_action' => true,
-					'priority' => 200,
-				);
+				'name' => 'delete',
+				'href' => "action/river/delete?id=$item->id",
+				'text' => elgg_view_icon('delete'),
+				'title' => elgg_echo('delete'),
+				'confirm' => elgg_echo('deleteconfirm'),
+				'is_action' => true,
+				'priority' => 200,
+			);
 			$return[] = ElggMenuItem::factory($options);
 		}
 	}