From e40958a97ddce771ac9a9f2a8473da7ee3e6534f Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 2 Nov 2010 21:38:55 +0000
Subject: Fixes #2463: Removed gratuitous references to $CONFIG->url, etc. from
 the rest of the plugins.

git-svn-id: http://code.elgg.org/elgg/trunk@7205 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/start.php                                        |  4 ++--
 mod/profile/views/default/profile/admin_menu.php             | 12 ++++++------
 .../default/profile/commentwall/commentwall_content.php      |  2 +-
 mod/profile/views/default/profile/menu/adminlinks.php        | 12 ++++++------
 mod/profile/views/default/profile/menu/friendlinks.php       |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'mod/profile')

diff --git a/mod/profile/start.php b/mod/profile/start.php
index caaf04055..3b97001fb 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -254,8 +254,8 @@ function profile_usericon_hook($hook, $entity_type, $returnvalue, $params){
 		$filehandler->setFilename("profile/" . $entity->guid . $size . ".jpg");
 
 		if ($filehandler->exists()) {
-			//$url = $CONFIG->url . "pg/icon/$username/$size/$icontime.jpg";
-			return elgg_get_site_url() . 'mod/profile/icondirect.php?lastcache='.$icontime.'&joindate=' . $entity->time_created . '&guid=' . $entity->guid . '&size='.$size;
+			//$url = "pg/icon/$username/$size/$icontime.jpg";
+			return 'mod/profile/icondirect.php?lastcache='.$icontime.'&joindate=' . $entity->time_created . '&guid=' . $entity->guid . '&size='.$size;
 		}
 	}
 }
diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php
index 076cdd49c..434da5a74 100755
--- a/mod/profile/views/default/profile/admin_menu.php
+++ b/mod/profile/views/default/profile/admin_menu.php
@@ -20,16 +20,16 @@ if (isadminloggedin()){
 	<li><a href="<?php echo $url; ?>pg/settings/user/<?php echo $user->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a></li>	
 	<?php
 		if (!$user->isBanned()) {
-			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "{$url}action/admin/user/ban?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
+			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "action/admin/user/ban?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
 		} else {
-			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "{$url}action/admin/user/unban?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>"; 
+			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "action/admin/user/unban?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>"; 
 		}
-		echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "{$url}action/admin/user/delete?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
-		echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "{$url}action/admin/user/resetpassword?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
+		echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "action/admin/user/delete?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
+		echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "action/admin/user/resetpassword?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
 		if (!$vars['entity']->admin) { 
-			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "{$url}action/admin/user/makeadmin?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
+			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "action/admin/user/makeadmin?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
 		} else {
-			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "{$url}action/admin/user/removeadmin?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
+			echo "<li>".elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "action/admin/user/removeadmin?guid={$user->guid}&__elgg_token=$token&__elgg_ts=$ts")) . "</li>";
 		}
 	?>
 	</ul>
diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php
index 666c95a87..c334e33d8 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall_content.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php
@@ -16,7 +16,7 @@
         // if the user looking at the comment can edit, show the delete link
 	    if ($vars['annotation']->canEdit()) {
 			       echo "<div class='entity_metadata'><span class='delete_button'>" . elgg_view("output/confirmlink",array(
-							'href' => elgg_get_site_url() . "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
+							'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
 								'text' => elgg_echo('delete'),
 								'confirm' => elgg_echo('deleteconfirm'),
 							)) . "</span></div>";
diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
index c7fd99857..39807764a 100644
--- a/mod/profile/views/default/profile/menu/adminlinks.php
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -13,16 +13,16 @@ if (isadminloggedin()){
 		<a href="<?php echo elgg_get_site_url(); ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
 <?php 
 			if (!$vars['entity']->isBanned()) {
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => elgg_get_site_url()."action/admin/user/ban?guid={$vars['entity']->guid}"));
+				echo elgg_view('output/confirmlink', array('text' => elgg_echo("ban"), 'href' => "action/admin/user/ban?guid={$vars['entity']->guid}"));
 			} else {
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => elgg_get_site_url()."action/admin/user/unban?guid={$vars['entity']->guid}")); 
+				echo elgg_view('output/confirmlink', array('text' => elgg_echo("unban"), 'href' => "action/admin/user/unban?guid={$vars['entity']->guid}")); 
 			}
-			echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => elgg_get_site_url()."action/admin/user/delete?guid={$vars['entity']->guid}"));
-			echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => elgg_get_site_url()."action/admin/user/resetpassword?guid={$vars['entity']->guid}"));
+			echo elgg_view('output/confirmlink', array('text' => elgg_echo("delete"), 'href' => "action/admin/user/delete?guid={$vars['entity']->guid}"));
+			echo elgg_view('output/confirmlink', array('text' => elgg_echo("resetpassword"), 'href' => "action/admin/user/resetpassword?guid={$vars['entity']->guid}"));
 			if (!$vars['entity']->isAdmin()) { 
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => elgg_get_site_url()."action/admin/user/makeadmin?guid={$vars['entity']->guid}"));
+				echo elgg_view('output/confirmlink', array('text' => elgg_echo("makeadmin"), 'href' => "action/admin/user/makeadmin?guid={$vars['entity']->guid}"));
 			} else {
-				echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => elgg_get_site_url()."action/admin/user/removeadmin?guid={$vars['entity']->guid}"));
+				echo elgg_view('output/confirmlink', array('text' => elgg_echo("removeadmin"), 'href' => "action/admin/user/removeadmin?guid={$vars['entity']->guid}"));
 			}
 		}
 	}
diff --git a/mod/profile/views/default/profile/menu/friendlinks.php b/mod/profile/views/default/profile/menu/friendlinks.php
index f9e72dd4f..ed13edb8b 100644
--- a/mod/profile/views/default/profile/menu/friendlinks.php
+++ b/mod/profile/views/default/profile/menu/friendlinks.php
@@ -10,13 +10,13 @@ $ts = time();
 $token = generate_action_token($ts);
 if ($vars['entity']->isFriend()) {
 	echo elgg_view('output/confirmlink', array(
-		'href' => elgg_get_site_url()."action/friends/remove?friend={$vars['entity']->getGUID()}",
+		'href' => "action/friends/remove?friend={$vars['entity']->getGUID()}",
 		'text' => elgg_echo('friend:remove'),
 		'class' => 'remove_friend'
 	));
 } else {
 	echo elgg_view('output/confirmlink', array(
-		'href' => elgg_get_site_url()."action/friends/add?friend={$vars['entity']->getGUID()}",
+		'href' => "action/friends/add?friend={$vars['entity']->getGUID()}",
 		'text' => elgg_echo('friend:add'),
 		'class' => 'add_friend'
 	));
-- 
cgit v1.2.3