aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorEvan Winslow <evan@elgg.org>2012-08-26 01:39:01 -0700
committerEvan Winslow <evan@elgg.org>2012-08-26 01:39:01 -0700
commit80dd4e833717d8410db97e055b969cf71b70690d (patch)
tree1bf9b22248285c92e80f5ce907e5f1b2b3a507cd /engine
parent104d7fcb9d73bde3e9412b7e3d7cef1671b40d41 (diff)
parent24ee620c1b33d550d704df0fc3259c0a9bce59cb (diff)
downloadelgg-80dd4e833717d8410db97e055b969cf71b70690d.tar.gz
elgg-80dd4e833717d8410db97e055b969cf71b70690d.tar.bz2
Merge pull request #349 from sembrestels/river-delete-validate
Fixes #4774. Added tokens insted is_action param in delete river menu item.
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/navigation.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 10b11acfe..8c3952594 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -339,11 +339,10 @@ function elgg_river_menu_setup($hook, $type, $return, $params) {
if (elgg_is_admin_logged_in()) {
$options = array(
'name' => 'delete',
- 'href' => "action/river/delete?id=$item->id",
+ 'href' => elgg_add_action_tokens_to_url("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);