From a267a9e8657564dc90bfcc142c1e80859fd91ec2 Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 15 Mar 2010 14:56:55 +0000 Subject: Replaced calls to deprecated elgg_validate_action_url() with elgg_add_action_tokens_to_url(). git-svn-id: http://code.elgg.org/elgg/trunk@5406 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/reportedcontent/views/default/reportedcontent/listing.php | 4 ++-- mod/sitepages/start.php | 1 + views/default/output/confirmlink.php | 4 ++-- views/default/output/url.php | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mod/reportedcontent/views/default/reportedcontent/listing.php b/mod/reportedcontent/views/default/reportedcontent/listing.php index 54ebd6a27..99069cb8c 100644 --- a/mod/reportedcontent/views/default/reportedcontent/listing.php +++ b/mod/reportedcontent/views/default/reportedcontent/listing.php @@ -30,8 +30,8 @@ if($vars['entity']){ echo "
"; echo ""; + echo "guid}") . "\">" . elgg_echo('reportedcontent:archive') . ""; + echo "guid}") . "\" onclick=\"return confirm('" . elgg_echo('reportedcontent:areyousure') . "')\">" . elgg_echo('reportedcontent:delete') . "
"; echo "

" . elgg_echo('reportedcontent:by') . ": " . $user . ", " . friendly_time($report->time_created) . "

"; echo "

" . elgg_echo('reportedcontent:objecttitle') . ": " . $report->title; echo "
" . elgg_echo('reportedcontent:moreinfo') . "

"; diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php index 5be36842a..c7baa1314 100644 --- a/mod/sitepages/start.php +++ b/mod/sitepages/start.php @@ -13,6 +13,7 @@ * * @todo * Check for SQL injection problems. + * Force [[login_box]] in the logged out view. * Make sure this stuff doesn't show up in search. * Check entity keyword views against fullview. Force to FALSE? * DRY up actions and views diff --git a/views/default/output/confirmlink.php b/views/default/output/confirmlink.php index 9377426ad..c4c0e0bfa 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'] . '"'; @@ -28,4 +28,4 @@ if (isset($vars['class']) && $vars['class']) { $class = ''; } ?> - onclick="return confirm('');"> \ No newline at end of file + onclick="return confirm('');"> diff --git a/views/default/output/url.php b/views/default/output/url.php index b77ffbf00..734df2c19 100644 --- a/views/default/output/url.php +++ b/views/default/output/url.php @@ -21,7 +21,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']) { -- cgit v1.2.3