From 5d9a8f414432e575b185c30b8e9764ab18f13ccd Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 9 Jul 2012 19:38:24 -0400 Subject: Refs #4631 $object->canEdit() check not necessary and added a confirm popup on delete to prevent accidental deletes --- engine/lib/navigation.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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); } } -- cgit v1.2.3