aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-21 22:04:32 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-21 22:04:32 +0000
commitb8320526845f126c24cbf0287399c9655b6b716d (patch)
treee2a4fd13e911c5a74e260262c64c188eb6d63e85 /views/default
parentce915d40a3b9151dcf03067eeac23a581efff897 (diff)
downloadelgg-b8320526845f126c24cbf0287399c9655b6b716d.tar.gz
elgg-b8320526845f126c24cbf0287399c9655b6b716d.tar.bz2
Deprecated elgg_validate_action_url() by elgg_add_action_tokens_to_url(). Updated elgg_deprecated_notice() to include the file & line of the caller. Updated core to use elgg_add_action_tokens_to_url().
git-svn-id: http://code.elgg.org/elgg/trunk@3962 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/output/confirmlink.php2
-rw-r--r--views/default/output/url.php2
-rw-r--r--views/default/page_elements/spotlight.php4
3 files changed, 4 insertions, 4 deletions
diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php
index 9377426ad..3370320ed 100644
--- a/views/default/output/confirmlink.php
+++ b/views/default/output/confirmlink.php
@@ -20,7 +20,7 @@ if (!$confirm) {
}
// always generate missing action tokens
-$link = elgg_validate_action_url($vars['href']);
+$link = elgg_add_action_tokens_to_url($vars['href']);
if (isset($vars['class']) && $vars['class']) {
$class = 'class="' . $vars['class'] . '"';
diff --git a/views/default/output/url.php b/views/default/output/url.php
index a2e659854..7d993c49e 100644
--- a/views/default/output/url.php
+++ b/views/default/output/url.php
@@ -25,7 +25,7 @@ $url = trim($vars['href']);
if (!empty($url)) {
if (array_key_exists('is_action', $vars) && $vars['is_action']) {
- $url = elgg_validate_action_url($url);
+ $url = elgg_add_action_tokens_to_url($url);
}
if (array_key_exists('target', $vars) && $vars['target']) {
diff --git a/views/default/page_elements/spotlight.php b/views/default/page_elements/spotlight.php
index 1c32f9b1d..0c7e49c0f 100644
--- a/views/default/page_elements/spotlight.php
+++ b/views/default/page_elements/spotlight.php
@@ -28,11 +28,11 @@
}
if ($closed) {
?>
- <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_validate_action_url("{$vars['url']}action/user/spotlight?closed=false"); ?>')">+</a>
+ <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=false"); ?>')">+</a>
<?php
} else {
?>
- <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_validate_action_url("{$vars['url']}action/user/spotlight?closed=true"); ?>')">-</a>
+ <a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo elgg_add_action_tokens_to_url("{$vars['url']}action/user/spotlight?closed=true"); ?>')">-</a>
<?php
}