Merge pull request #296 from sembrestels/delete-river

Delete river items

2 files changed, 15 insertions, 1 deletions

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 4ff009bfb..61d283f4b 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -335,6 +335,18 @@ function elgg_river_menu_setup($hook, $type, $return, $params) {
 				$return[] = ElggMenuItem::factory($options);
 			}
 		}
+		
+		if ($object->canEdit() && 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,
+				);
+			$return[] = ElggMenuItem::factory($options);
+		}
 	}
 
 	return $return;
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 711832f70..b717a7756 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -643,9 +643,11 @@ function elgg_river_init() {
 	elgg_register_page_handler('activity', 'elgg_river_page_handler');
 	$item = new ElggMenuItem('activity', elgg_echo('activity'), 'activity');
 	elgg_register_menu_item('site', $item);
-
+	
 	elgg_register_widget_type('river_widget', elgg_echo('river:widget:title'), elgg_echo('river:widget:description'));
 
+	elgg_register_action('river/delete', '', 'admin');
+
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'elgg_river_test');
 }