Refs #2463: Removed some more instances of $CONFIG->url. Added support for elgg_normalize_url to elgg_add_action_tokens_to_url

git-svn-id: http://code.elgg.org/elgg/trunk@7200 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 8 insertions, 8 deletions

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 464ffb8c5..492c04eab 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -24,7 +24,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 		?>
 			<span class="delete_button">
 				<?php echo elgg_view("output/confirmlink",array(
-						'href' => elgg_get_site_url() . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
+						'href' => "action/comments/delete?annotation_id=" . $vars['annotation']->id,
 						'text' => elgg_echo('delete'),
 						'confirm' => elgg_echo('deleteconfirm')
 						));
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index ecd109978..8b6be9220 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -23,7 +23,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 		?>
 			<div class="entity_metadata"><span class="delete_button">
 				<?php echo elgg_view("output/confirmlink",array(
-						'href' => elgg_get_site_url() . "action/likes/delete?annotation_id=" . $vars['annotation']->id,
+						'href' => "action/likes/delete?annotation_id=" . $vars['annotation']->id,
 						'text' => elgg_echo('remove'),
 						'confirm' => elgg_echo('deleteconfirm')
 						));
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index 636d2ab5c..9981dd291 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -25,7 +25,7 @@ echo "<li><h2>";
 if ($coll->owner_guid == get_loggedin_userid()) {
 	echo "<div class=\"friends_collections_controls\">";
 	echo elgg_view('output/confirmlink', array(
-			'href' => elgg_get_site_url() . 'action/friends/deletecollection?collection=' . $coll->id,
+			'href' => 'action/friends/deletecollection?collection=' . $coll->id,
 			'class' => 'delete_collection'
 		));
 	echo "</div>";
diff --git a/views/default/object/default.php b/views/default/object/default.php
index 6975804c3..0f07996b2 100644
--- a/views/default/object/default.php
+++ b/views/default/object/default.php
@@ -29,7 +29,7 @@ if ($vars['full']) {
 	$controls = "";
 	if ($vars['entity']->canEdit()) {
 		$delete = elgg_view('output/confirm_link', array(
-			'href' => elgg_get_site_url()."action/entities/delete?guid={$vars['entity']->guid}", 
+			'href' => "action/entities/delete?guid={$vars['entity']->guid}", 
 			'text' => elgg_echo('delete')
 		));
 		$controls .= " ($delete)";
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 3704e9a49..37cba4425 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -38,17 +38,17 @@ $new_button = '';
 $default_tabs = array(
 	'all' => array(
 		'title' => elgg_echo('all'),
-		'url' => (isset($vars['all_link'])) ? $vars['all_link'] : elgg_get_site_url()."mod/$type/all.php",
+		'url' => (isset($vars['all_link'])) ? $vars['all_link'] : "mod/$type/all.php",
 		'selected' => ($filter_context == 'everyone'),
 	),
 	'mine' => array(
 		'title' => elgg_echo('mine'),
-		'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : elgg_get_site_url()."pg/$type/$username",
+		'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "pg/$type/$username",
 		'selected' => ($filter_context == 'mine'),
 	),
 	'friend' => array(
 		'title' => elgg_echo('friends'),
-		'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : elgg_get_site_url()."pg/$type/$username/friends",
+		'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "pg/$type/$username/friends",
 		'selected' => ($filter_context == 'friends'),
 	),
 );
diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/elgg_topbar_logout.php
index ca3d16707..38a37bc22 100644
--- a/views/default/page_elements/elgg_topbar_logout.php
+++ b/views/default/page_elements/elgg_topbar_logout.php
@@ -7,7 +7,7 @@
 
 echo '<div class="log_out">';
 echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url()."action/logout",
+	'href' => "action/logout",
 	'text' => elgg_echo('logout'),
 	'is_action' => TRUE
 ));