aboutsummaryrefslogtreecommitdiff
path: root/views/default/output/confirmlink.php
diff options
context:
space:
mode:
authornickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-11 23:51:26 +0000
committernickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-11 23:51:26 +0000
commit36b73bf25407fbc0591d33d3b0d39059bdce7005 (patch)
treeecccfe1d62e9ad7c2ab68fe40caee60b0ace176e /views/default/output/confirmlink.php
parentbff71b273807307eb8c726db04a6b641d4a91669 (diff)
downloadelgg-36b73bf25407fbc0591d33d3b0d39059bdce7005.tar.gz
elgg-36b73bf25407fbc0591d33d3b0d39059bdce7005.tar.bz2
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
Diffstat (limited to 'views/default/output/confirmlink.php')
-rw-r--r--views/default/output/confirmlink.php12
1 files changed, 2 insertions, 10 deletions
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'] . '"';