aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-02 21:38:55 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-02 21:38:55 +0000
commite40958a97ddce771ac9a9f2a8473da7ee3e6534f (patch)
tree2e11cad9676db5a0421b3aa98a570cd78a83cbf2 /mod
parent1d3d21b69eafb45c97e283ead86f63e7bf1731dc (diff)
downloadelgg-e40958a97ddce771ac9a9f2a8473da7ee3e6534f.tar.gz
elgg-e40958a97ddce771ac9a9f2a8473da7ee3e6534f.tar.bz2
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
Diffstat (limited to 'mod')
-rw-r--r--mod/messageboard/views/default/messageboard/messageboard_content.php2
-rw-r--r--mod/messages/start.php5
-rw-r--r--mod/messages/views/default/messages/messages.php2
-rw-r--r--mod/messages/views/default/messages/view.php4
-rw-r--r--mod/pages/history.php2
-rw-r--r--mod/pages/new.php2
-rw-r--r--mod/pages/start.php21
-rw-r--r--mod/pages/view.php4
-rw-r--r--mod/pages/welcome.php2
-rw-r--r--mod/profile/start.php4
-rwxr-xr-xmod/profile/views/default/profile/admin_menu.php12
-rw-r--r--mod/profile/views/default/profile/commentwall/commentwall_content.php2
-rw-r--r--mod/profile/views/default/profile/menu/adminlinks.php12
-rw-r--r--mod/profile/views/default/profile/menu/friendlinks.php4
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/sitemessage.php2
-rw-r--r--mod/sitepages/start.php2
-rw-r--r--mod/thewire/start.php5
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php6
19 files changed, 44 insertions, 51 deletions
diff --git a/mod/messageboard/views/default/messageboard/messageboard_content.php b/mod/messageboard/views/default/messageboard/messageboard_content.php
index 5f3db4d18..b6307f33b 100644
--- a/mod/messageboard/views/default/messageboard/messageboard_content.php
+++ b/mod/messageboard/views/default/messageboard/messageboard_content.php
@@ -33,7 +33,7 @@
echo "<div class='delete_message'>" . elgg_view("output/confirmlink",array(
- 'href' => elgg_get_site_url() . "action/messageboard/delete?annotation_id=" . $vars['annotation']->id,
+ 'href' => "action/messageboard/delete?annotation_id=" . $vars['annotation']->id,
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</div>";
diff --git a/mod/messages/start.php b/mod/messages/start.php
index fcf3afde9..de8f42e51 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -274,10 +274,7 @@ function messages_page_handler($page) {
}
function messages_url($message) {
-
- global $CONFIG;
- return $CONFIG->url . "pg/messages/" . $message->getOwnerEntity()->username . "/read/" . $message->getGUID();
-
+ return "pg/messages/" . $message->getOwnerEntity()->username . "/read/" . $message->getGUID();
}
// A simple function to count the number of messages that are unread in a user's inbox
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index ec94c5f0f..9eeaa9ef4 100644
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -46,7 +46,7 @@ if (isloggedin())
<div class="content_header_options">
<a class="action_button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
<?php echo elgg_view("output/confirmlink", array(
- 'href' => elgg_get_site_url() . "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
+ 'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
'class' => "action_button disabled"
diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php
index 7d9e45ad2..13f6fec82 100644
--- a/mod/messages/views/default/messages/view.php
+++ b/mod/messages/views/default/messages/view.php
@@ -41,7 +41,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
echo "<div class='message_subject'>";
// display delete button
echo "<span class='delete_button'>" . elgg_view("output/confirmlink", array(
- 'href' => elgg_get_site_url() . "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')),
+ 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=inbox&submit=" . urlencode(elgg_echo('delete')),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</span>";
@@ -76,7 +76,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
echo "<div class='message_subject'>";
//display the link to 'delete'
echo "<div class='delete_button'>" . elgg_view("output/confirmlink", array(
- 'href' => elgg_get_site_url() . "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')),
+ 'href' => "action/messages/delete?message_id=" . $message->getGUID() . "&type=sent&submit=" . urlencode(elgg_echo('delete')),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</div>";
diff --git a/mod/pages/history.php b/mod/pages/history.php
index dfbe3ab59..9228a65a9 100644
--- a/mod/pages/history.php
+++ b/mod/pages/history.php
@@ -25,7 +25,7 @@ $offset = (int)get_input('offset');
$page_guid = get_input('page_guid');
$pages = get_entity($page_guid);
-add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
$title = $pages->title . ": " . elgg_echo("pages:history");
$content = elgg_view_title($title);
diff --git a/mod/pages/new.php b/mod/pages/new.php
index 2003b183e..2674daf16 100644
--- a/mod/pages/new.php
+++ b/mod/pages/new.php
@@ -28,7 +28,7 @@ if(get_input('parent_guid')){
}
global $CONFIG;
-add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
$title = elgg_echo("pages:new");
$area2 .= elgg_view_title($title);
diff --git a/mod/pages/start.php b/mod/pages/start.php
index fb09b2280..4c7bb1d15 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -68,10 +68,9 @@ function pages_init() {
}
function pages_url($entity) {
- global $CONFIG;
$title = elgg_get_friendly_title($entity->title);
- return $CONFIG->url . "pg/pages/view/{$entity->guid}/$title";
+ return "pg/pages/view/{$entity->guid}/$title";
}
/**
@@ -132,12 +131,12 @@ function pages_page_handler($page) {
}
$entity = get_entity($page[1]);
- add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+ add_submenu_item(elgg_echo('pages:label:view'), "pg/pages/view/{$page[1]}", 'pageslinks');
// add_submenu_item(elgg_echo('pages:user'), elgg_get_site_url() . "pg/pages/owned/" . get_loggedin_user()->username, 'pageslinksgeneral');
if (($entity) && ($entity->canEdit())) {
- add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+ add_submenu_item(elgg_echo('pages:label:edit'), "pg/pages/edit/{$page[1]}", 'pagesactions');
}
- add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+ add_submenu_item(elgg_echo('pages:label:history'), "pg/pages/history/{$page[1]}", 'pageslinks');
include($CONFIG->pluginspath . "pages/edit.php");
break;
@@ -150,12 +149,12 @@ function pages_page_handler($page) {
elgg_extend_view('metatags','pages/metatags');
$entity = get_entity($page[1]);
- //add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+ //add_submenu_item(elgg_echo('pages:label:view'), "pg/pages/view/{$page[1]}", 'pageslinks');
if (($entity) && ($entity->canEdit())) {
- add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+ add_submenu_item(elgg_echo('pages:label:edit'), "pg/pages/edit/{$page[1]}", 'pagesactions');
}
- add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+ add_submenu_item(elgg_echo('pages:label:history'), "pg/pages/history/{$page[1]}", 'pageslinks');
include($CONFIG->pluginspath . "pages/view.php");
break;
@@ -168,11 +167,11 @@ function pages_page_handler($page) {
elgg_extend_view('metatags','pages/metatags');
$entity = get_entity($page[1]);
- add_submenu_item(elgg_echo('pages:label:view'), $CONFIG->url . "pg/pages/view/{$page[1]}", 'pageslinks');
+ add_submenu_item(elgg_echo('pages:label:view'), "pg/pages/view/{$page[1]}", 'pageslinks');
if (($entity) && ($entity->canEdit())) {
- add_submenu_item(elgg_echo('pages:label:edit'), $CONFIG->url . "pg/pages/edit/{$page[1]}", 'pagesactions');
+ add_submenu_item(elgg_echo('pages:label:edit'), "pg/pages/edit/{$page[1]}", 'pagesactions');
}
- add_submenu_item(elgg_echo('pages:label:history'), $CONFIG->url . "pg/pages/history/{$page[1]}", 'pageslinks');
+ add_submenu_item(elgg_echo('pages:label:history'), "pg/pages/history/{$page[1]}", 'pageslinks');
include($CONFIG->pluginspath . "pages/history.php");
break;
diff --git a/mod/pages/view.php b/mod/pages/view.php
index bbbed6d22..6eb58ed8e 100644
--- a/mod/pages/view.php
+++ b/mod/pages/view.php
@@ -28,11 +28,11 @@ if ($container) {
}
global $CONFIG;
-// add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+// add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
if ($pages->canEdit()) {
add_submenu_item(elgg_echo('pages:newchild'), "pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
- $delete_url = elgg_add_action_tokens_to_url($CONFIG->url . "action/pages/delete?page={$pages->getGUID()}");
+ $delete_url = elgg_add_action_tokens_to_url("action/pages/delete?page={$pages->getGUID()}");
add_submenu_item(elgg_echo('pages:delete'), $delete_url, 'pagesactions', true);
}
diff --git a/mod/pages/welcome.php b/mod/pages/welcome.php
index 759114965..41fa87aa1 100644
--- a/mod/pages/welcome.php
+++ b/mod/pages/welcome.php
@@ -24,7 +24,7 @@ if ($page_owner === false || is_null($page_owner)) {
//get the owners welcome message if it exists
$welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'container_guid' => $page_owner->getGUID(), 'limit' => 1));
global $CONFIG;
-add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
$title = elgg_echo("pages:welcome");
$area2 .= elgg_view_title($title);
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'
));
diff --git a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
index 443ad0fc6..522b32740 100644
--- a/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
+++ b/mod/riverdashboard/views/default/riverdashboard/sitemessage.php
@@ -14,7 +14,7 @@ if ($site_message) {
$message = $mes->description;
$dateStamp = elgg_view_friendly_time($mes->time_created);
$delete = elgg_view("output/confirmlink",array(
- 'href' => elgg_get_site_url() . "action/riverdashboard/delete?message=" . $mes->guid,
+ 'href' => "action/riverdashboard/delete?message=" . $mes->guid,
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
));
diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index eeb3fe08e..ea996e099 100644
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -99,7 +99,7 @@ function sitepages_custom_index() {
*/
function sitepages_url($expage) {
global $CONFIG;
- return $CONFIG->url . 'pg/sitepages/';
+ return 'pg/sitepages/';
}
/**
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 456917d0c..4031ded42 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -99,10 +99,7 @@
}
function thewire_url($thewirepost) {
-
- global $CONFIG;
- return $CONFIG->url . "pg/thewire/" . $thewirepost->getOwnerEntity()->username;
-
+ return "pg/thewire/" . $thewirepost->getOwnerEntity()->username;
}
/**
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index df30f4f1e..9e59596ac 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -36,7 +36,7 @@ if (isset($vars['entity'])) {
// if the user looking at thewire post can edit, show the delete link
if ($vars['entity']->canEdit()) {
echo "<span class='delete_button'>" . elgg_view("output/confirmlink",array(
- 'href' => elgg_get_site_url() . "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
+ 'href' => "action/thewire/delete?thewirepost=" . $vars['entity']->getGUID(),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</span>";
diff --git a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
index dbfc0ac66..9e9efa29a 100644
--- a/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
+++ b/mod/uservalidationbyemail/views/default/uservalidationbyemail/unvalidated_user.php
@@ -20,19 +20,19 @@ $created = sprintf(elgg_echo('uservalidationbyemail:admin:user_created'), elgg_v
$validate = elgg_view('output/confirmlink', array(
'confirm' => sprintf(elgg_echo('uservalidationbyemail:confirm_validate_user'), $user->username),
- 'href' => elgg_get_site_url() . "action/uservalidationbyemail/validate/?user_guids[]=$user->guid",
+ 'href' => "action/uservalidationbyemail/validate/?user_guids[]=$user->guid",
'text' => elgg_echo('uservalidationbyemail:admin:validate')
));
$resend_email = elgg_view('output/confirmlink', array(
'confirm' => sprintf(elgg_echo('uservalidationbyemail:confirm_resend_validation'), $user->username),
- 'href' => elgg_get_site_url() . "action/uservalidationbyemail/resend_validation/?user_guids[]=$user->guid",
+ 'href' => "action/uservalidationbyemail/resend_validation/?user_guids[]=$user->guid",
'text' => elgg_echo('uservalidationbyemail:admin:resend_validation')
));
$delete = elgg_view('output/confirmlink', array(
'confirm' => sprintf(elgg_echo('uservalidationbyemail:confirm_delete'), $user->username),
- 'href' => elgg_get_site_url() . "action/uservalidationbyemail/delete/?user_guids[]=$user->guid",
+ 'href' => "action/uservalidationbyemail/delete/?user_guids[]=$user->guid",
'text' => elgg_echo('uservalidationbyemail:admin:delete')
));