diff options
author | Sem <sembrestels@riseup.net> | 2012-07-07 03:03:04 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-07-07 03:03:04 +0200 |
commit | 2329cb233a8766ac1a6bc5d5b4d699f2ab773ea4 (patch) | |
tree | 9532b5aaa98df42a31d883af9a5ce22caad02ab5 /engine | |
parent | b2f46500941a2093734e7672a4de79aabd95b9fc (diff) | |
download | elgg-2329cb233a8766ac1a6bc5d5b4d699f2ab773ea4.tar.gz elgg-2329cb233a8766ac1a6bc5d5b4d699f2ab773ea4.tar.bz2 |
Fixes #4631. Admins are now able to delete river items.
Diffstat (limited to 'engine')
-rw-r--r-- | engine/lib/navigation.php | 12 | ||||
-rw-r--r-- | engine/lib/river.php | 4 |
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'); } |