Fixes #2463: Removed gratuitous references to $CONFIG->url, etc. from the rest of...

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

diff --git a/mod/messageboard/views/default/messageboard/messageboard_content.php b/mod/messageboard/views/default/messageboard/messageboard_content.php
index 5f3db4d1815beb969d97cf2ddaf84d90acf15f01..b6307f33bfe64ce6be6be8f90d95261b1f47b968 100644 (file)
--- 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 fcf3afde929046941f539a6b8ad72f1db97df80c..de8f42e5164c4ce3c8a2f98cec0364cbb90e5db4 100644 (file)
--- 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 ec94c5f0fae1fffef5c20417a8651dd8edf6190a..9eeaa9ef4c80a8c852773d50a4fe12394d5dab86 100644 (file)
--- 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 7d9e45ad2fce5533b7183d3a2849f65fb6e65d2c..13f6fec827b9f207473d76e0d7768329dc5faad2 100644 (file)
--- 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 dfbe3ab5960bd33b5a634c219af9f9527c73bf01..9228a65a9673f160e5308119639514d0ad86992e 100644 (file)
--- 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 2003b183ec7f16c4918ccab8351367cc6f142dd8..2674daf16aeea8c392aeaac5e69b3125d6adfe2d 100644 (file)
--- 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 fb09b2280aea07097fe775e1c01d739b7d71a6a9..4c7bb1d159ff700ca79c532f7138dec387b21aa5 100644 (file)
--- 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 bbbed6d22182ca98aca1e08668902d2c77ee8fe4..6eb58ed8ee7ac9b4b94bd725f4e4b9903d09b0d3 100644 (file)
--- 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 759114965f366c57d98a99385fb3ef83152c5b70..41fa87aa1b8a6c5b9a784a08ffeb123fccc9b349 100644 (file)
--- 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 caaf0405543fd09c3e10cc481216bfb7708051f2..3b97001fbdfdead4958910a68ca907f296aaa119 100644 (file)
--- 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 076cdd49c9cd1ca833e96c10a0fc09153a4aec63..434da5a7423ff4c4252281014d56e5e36c2ab72c 100755 (executable)
--- 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 666c95a878eae78dfba4adf39e11a1122d2c21cf..c334e33d8f2303bff5316122b4dd769c5059bcc7 100644 (file)
--- 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 c7fd99857fc1f4e9fd7ee37cb89115b5463bb6de..39807764a4595056ef93482ba24464f9de453a48 100644 (file)
--- 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 f9e72dd4fc1c504149195ddcc6285357112c345c..ed13edb8b844f08dcabceefc6cb93493ec7c37b1 100644 (file)
--- 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 443ad0fc65452fac2c1705053224e0f3ff029233..522b32740d0251bbafc012c05b803144847f821b 100644 (file)
--- 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 eeb3fe08e00cc2b7410a2c8aad440afd227b8358..ea996e099bdfd341e0ffb4983393d444ce5b8d25 100644 (file)
--- 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 456917d0c727f1f20b253277298757d5f1de185b..4031ded42510797a31f823f9f4147d2935f93a5c 100644 (file)
--- 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 df30f4f1e86536f3d00745656fc62970ba0e8c9c..9e59596ac84696d6c28b2f797768f44461795cfb 100644 (file)
--- 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 dbfc0ac66ebdb4c51b150eefbd9f89894b83a4c2..9e9efa29a219b9b0a5bd0d535a10885ba2e11f85 100644 (file)
--- 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')
 ));