From 36b73bf25407fbc0591d33d3b0d39059bdce7005 Mon Sep 17 00:00:00 2001 From: nickw Date: Mon, 11 Jan 2010 23:51:26 +0000 Subject: Always generating action tokens with output/confirmlink. Includes a check for actions already defining the tokens. git-svn-id: http://code.elgg.org/elgg/trunk@3799 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/output/confirmlink.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'views/default') diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index e95dd5f31..9377426ad 100644 --- a/views/default/output/confirmlink.php +++ b/views/default/output/confirmlink.php @@ -19,16 +19,8 @@ if (!$confirm) { $confirm = elgg_echo('question:areyousure'); } -$link = $vars['href']; - -if (isset($vars['is_action']) && $vars['is_action']) { - $ts = time(); - $token = generate_action_token($ts); - - $sep = "?"; - if (strpos($link, '?')>0) $sep = "&"; - $link = "$link{$sep}__elgg_token=$token&__elgg_ts=$ts"; -} +// always generate missing action tokens +$link = elgg_validate_action_url($vars['href']); if (isset($vars['class']) && $vars['class']) { $class = 'class="' . $vars['class'] . '"'; -- cgit v1.2.3