From bb1f45eb02bac603d67ac08cb674c4050a245c28 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 30 Oct 2010 22:23:45 +0000
Subject: Refs #2598: Converted most $vars['url'] to elgg_get_site_url()

git-svn-id: http://code.elgg.org/elgg/trunk@7149 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/account/forms/forgotten_password.php |  2 +-
 views/default/account/forms/login.php              |  8 ++--
 views/default/account/forms/login_dropdown.php     | 10 ++---
 .../default/account/forms/login_walled_garden.php  |  8 ++--
 views/default/account/forms/register.php           |  2 +-
 views/default/account/forms/useradd.php            |  2 +-
 views/default/admin/appearance/menu_items.php      |  2 +-
 views/default/admin/components/plugin.php          | 18 ++++----
 views/default/admin/components/plugin_settings.php |  2 +-
 views/default/admin/plugins/simple.php             |  4 +-
 views/default/annotation/generic_comment.php       |  2 +-
 views/default/annotation/latest_comments.php       |  2 +-
 views/default/annotation/likes.php                 |  2 +-
 views/default/canvas/layouts/administration.php    | 18 ++++----
 views/default/canvas/layouts/widgets.php           | 18 ++++----
 views/default/comments/forms/edit.php              |  2 +-
 views/default/css.php                              | 52 +++++++++++-----------
 views/default/dashboard/blurb.php                  |  2 +-
 views/default/friends/collection.php               |  4 +-
 views/default/friends/collectiontabs.php           |  4 +-
 views/default/friends/forms/edit.php               |  2 +-
 views/default/group/search/finishblurb.php         |  2 +-
 views/default/input/autocomplete.php               |  4 +-
 views/default/input/userpicker.php                 |  4 +-
 views/default/likes/forms/edit.php                 |  2 +-
 views/default/likes/forms/link.php                 |  2 +-
 views/default/object/default.php                   |  2 +-
 views/default/object/plugin.php                    |  2 +-
 views/default/output/tagcloud.php                  |  4 +-
 views/default/output/tags.php                      |  2 +-
 views/default/page_elements/content_header.php     |  6 +--
 views/default/page_elements/elgg_footer.php        |  2 +-
 views/default/page_elements/elgg_header_logo.php   |  2 +-
 views/default/page_elements/elgg_topbar.php        |  6 +--
 views/default/page_elements/elgg_topbar_logout.php |  2 +-
 views/default/page_elements/html_begin.php         | 20 ++++-----
 views/default/page_elements/html_begin_admin.php   | 12 ++---
 views/default/page_shells/walled_garden.php        | 18 ++++----
 views/default/settings/system.php                  |  2 +-
 views/default/settings/upgrading.php               |  4 +-
 views/default/user/search/finishblurb.php          |  2 +-
 views/default/usersettings/form.php                |  2 +-
 views/default/widgets/editwrapper.php              |  4 +-
 views/default/widgets/wrapper.php                  |  2 +-
 44 files changed, 137 insertions(+), 137 deletions(-)

(limited to 'views/default')

diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 6c000bfc6..0d88cf8f7 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -13,7 +13,7 @@ $form_body .= elgg_view('input/captcha');
 $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
 
 echo elgg_view('input/form', array(
-	'action' => "{$vars['url']}action/user/requestnewpassword",
+	'action' => elgg_get_site_url()."action/user/requestnewpassword",
 	'body' => $form_body,
 	'class' => "margin_top"
 ));
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 8f3986c4e..ceaaf66d0 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -17,12 +17,12 @@ $form_body .= "<div class='persistent_login'><label><input type='checkbox' name=
 $form_body .= elgg_view('login/extend');
 
 $form_body .= "<p class='loginbox'>";
-$form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+$form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
+$form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
 
-$login_url = $vars['url'];
+$login_url = elgg_get_site_url();
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-	$login_url = str_replace("http", "https", $vars['url']);
+	$login_url = str_replace("http", "https", elgg_get_site_url());
 }
 ?>
 
diff --git a/views/default/account/forms/login_dropdown.php b/views/default/account/forms/login_dropdown.php
index 402e500d5..978507914 100644
--- a/views/default/account/forms/login_dropdown.php
+++ b/views/default/account/forms/login_dropdown.php
@@ -12,13 +12,13 @@ if (!isloggedin()) {
 	$form_body .= elgg_view('login/extend');
 
 	$form_body .= "<p class='loginbox'>";
-	$form_body .= $CONFIG->allow_registration ? "<a href=\"{$vars['url']}pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
-	$form_body .= "<a href=\"{$vars['url']}pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
+	$form_body .= $CONFIG->allow_registration ? "<a href=\"".elgg_get_site_url()."pg/register/\">" . elgg_echo('register') . '</a> | ' : '';
+	$form_body .= "<a href=\"".elgg_get_site_url()."pages/account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";
 	$form_body .= "<input type='hidden' name='returntoreferer' value='true' />";
 
-	$login_url = $vars['url'];
+	$login_url = elgg_get_site_url();
 	if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-		$login_url = str_replace("http", "https", $vars['url']);
+		$login_url = str_replace("http", "https", elgg_get_site_url());
 	}
 ?>
 
@@ -89,7 +89,7 @@ $(document).ready(function() {
 }
 #login_dropdown #signin_button a.signin span {
 	padding:4px 0 6px 12px;
-	background-image:url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-position:-150px -51px;
 	background-repeat:no-repeat;
 }
diff --git a/views/default/account/forms/login_walled_garden.php b/views/default/account/forms/login_walled_garden.php
index 72af49359..8b5d593bb 100644
--- a/views/default/account/forms/login_walled_garden.php
+++ b/views/default/account/forms/login_walled_garden.php
@@ -15,13 +15,13 @@ $form_body .= "<div class='remember_me'><label><input type='checkbox' name='pers
 $register = elgg_echo('register');
 $lost_password = elgg_echo('user:password:lost');
 $form_body .= '<p class="lost_password">';
-$form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"{$vars['url']}pg/register/\">$register</a> | " : '';
+$form_body .= $CONFIG->allow_registration ? "<a class=\"registration_link\" href=\"".elgg_get_site_url()."pg/register/\">$register</a> | " : '';
 $form_body .= "<a class='forgotten_password_link' href=\"{$login_url}pages/account/forgotten_password.php\">$lost_password</a>";
 $form_body .= '</p>';
 
-$login_url = $vars['url'];
+$login_url = elgg_get_site_url();
 if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
-	$login_url = str_replace("http", "https", $vars['url']);
+	$login_url = str_replace("http", "https", elgg_get_site_url());
 }
 ?>
 <h2><?php echo elgg_echo('login'); ?></h2>
@@ -60,7 +60,7 @@ __HTML;
 		<h2><?php echo elgg_echo('user:password:lost'); ?></h2>
 		<?php
 			echo elgg_view('input/form', array(
-				'action' => "{$vars['url']}action/user/requestnewpassword",
+				'action' => elgg_get_site_url()."action/user/requestnewpassword",
 				'body' => $lostpassword_form_body
 			));
 		?>
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index c6b47c82e..9b777ba64 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -38,7 +38,7 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v
 $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register'));
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 
-echo elgg_view('input/form', array('action' => "{$vars['url']}action/register", 'body' => $form_body, 'class' => "margin_top"));
+echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/register", 'body' => $form_body, 'class' => "margin_top"));
 ?>
 
 <script type="text/javascript">
diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index 7cab08804..bad1b11df 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -27,5 +27,5 @@ $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value
 
 <div class="admin_settings add_user">
 	<h3><?php echo elgg_echo('adduser'); ?></h3>
-	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}action/useradd", 'body' => $form_body)) ?>
+	<?php echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/useradd", 'body' => $form_body)) ?>
 </div>
\ No newline at end of file
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index b6177dfd0..e6a40c754 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -82,6 +82,6 @@ $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 
 echo elgg_view('input/form', array(
 	'body' => $form_body,
-	'action' => "{$vars['url']}action/admin/menu_items"
+	'action' => elgg_get_site_url()."action/admin/menu_items"
 ));
 echo "</div>";
\ No newline at end of file
diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php
index 4b26465e6..013f0cd07 100644
--- a/views/default/admin/components/plugin.php
+++ b/views/default/admin/components/plugin.php
@@ -29,30 +29,30 @@ $active_class = ($active) ? 'active' : 'not_active';
 
 $top_url = $up_url = $down_url = $bottom_url = '';
 if ($vars['order'] > 10) {
-	$top_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=1&__elgg_token=$token&__elgg_ts=$ts";
+	$top_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=1&__elgg_token=$token&__elgg_ts=$ts";
 	$top_link = '<a href="' . elgg_format_url($top_url) . '">' . elgg_echo('top') . '</a>';
 
 	$order = $vars['order'] - 11;
 
-	$up_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts";
+	$up_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts";
 	$up_link = '<a href="' . elgg_format_url($up_url) . '">' . elgg_echo('up') . '</a>';
 }
 
 if ($vars['order'] < $vars['maxorder']) {
 	$order =  $vars['order'] + 11;
-	$down_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts";
+	$down_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts";
 	$down_link = '<a href="' . elgg_format_url($down_url) . '">' . elgg_echo('down') . '</a>';
 
 	$order = $vars['maxorder'] + 11;
-	$bottom_url = "{$vars['url']}action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts";
+	$bottom_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts";
 	$bottom_link = '<a href="' . elgg_format_url($bottom_url) . '">' . elgg_echo('bottom') . '</a>';
 }
 
 if ($active) {
-	$url = "{$vars['url']}action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts";
+	$url = elgg_get_site_url()."action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts";
 	$enable_disable = '<a class="cancel_button" href="' . elgg_format_url($url) . '">' . elgg_echo('disable') . '</a>';
 } else {
-	$url = "{$vars['url']}action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts";
+	$url = elgg_get_site_url()."action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts";
 	$enable_disable = '<a class="submit_button" href="' . elgg_format_url($url) . '">' . elgg_echo('enable') . '</a>';
 }
 
@@ -60,7 +60,7 @@ if ($active) {
 $categories_list = '';
 if ($manifest['category']) {
 	$categories_arr = array();
-	$base_url = "{$vars['url']}pg/admin/plugins?category=";
+	$base_url = elgg_get_site_url()."pg/admin/plugins?category=";
 
 	foreach($manifest['category'] as $category) {
 		$url = $base_url . urlencode($category);
@@ -72,7 +72,7 @@ if ($manifest['category']) {
 
 $screenshots = '';
 if ($manifest['screenshot']) {
-	$base_url = "{$vars['url']}mod/";
+	$base_url = elgg_get_site_url()."mod/";
 
 	$limit = 4;
 	foreach ($manifest['screenshot'] as $screenshot) {
@@ -98,7 +98,7 @@ if ($manifest['screenshot']) {
 
 	<?php
 	if (elgg_view_exists("settings/{$plugin}/edit")) {
-		$link = "{$vars['url']}pg/admin/plugin_settings/$plugin";
+		$link = elgg_get_site_url()."pg/admin/plugin_settings/$plugin";
 		$settings_link = "<a class='plugin_settings small link' href='$link'>[". elgg_echo('settings') ."]</a>";
 	}
 	?>
diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 05623ffbb..13e962634 100644
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -16,4 +16,4 @@ $form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'cla
 
 echo elgg_view_title($plugin_info['name']);
 
-echo elgg_view('input/form', array('body' => $form_body, 'internalid' => 'plugin_settings', 'action' => "{$vars['url']}action/plugins/settings/save"));
\ No newline at end of file
+echo elgg_view('input/form', array('body' => $form_body, 'internalid' => 'plugin_settings', 'action' => elgg_get_site_url()."action/plugins/settings/save"));
\ No newline at end of file
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
index 0d1987d05..3baa00caf 100644
--- a/views/default/admin/plugins/simple.php
+++ b/views/default/admin/plugins/simple.php
@@ -57,7 +57,7 @@ foreach ($plugin_list as $name => $info) {
 	}
 
 	if (elgg_view_exists("settings/{$info['installed_name']}/edit")) {
-		$settings_href = "{$vars['url']}pg/admin/plugin_settings/{$info['installed_name']}";
+		$settings_href = elgg_get_site_url()."pg/admin/plugin_settings/{$info['installed_name']}";
 		$settings = " | <a class='plugin_settings link' href='$settings_href'>". elgg_echo('settings') ."</a>";
 	}
 
@@ -88,7 +88,7 @@ $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
 $form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'action_button disabled'));
 
 echo elgg_view('input/form', array(
-	'action' => "{$vars['url']}action/admin/plugins/simple_update_states",
+	'action' => elgg_get_site_url()."action/admin/plugins/simple_update_states",
 	'body' => $form_body,
 	'class' => 'admin_plugins_simpleview'
 ));
\ No newline at end of file
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 5b9c62840..464ffb8c5 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' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
+						'href' => elgg_get_site_url() . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
 						'text' => elgg_echo('delete'),
 						'confirm' => elgg_echo('deleteconfirm')
 						));
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 79a50fea1..43f44f43b 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -29,7 +29,7 @@ if($vars['comments']){
 		}
 	
 		echo "<div class='generic_comment latest clearfloat'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
-		echo "<div class='generic_comment_details'><span class='entity_subtext'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity_title'>{$url_display}</span> ({$friendlytime})</span></div>";
+		echo "<div class='generic_comment_details'><span class='entity_subtext'><a href=\"".elgg_get_site_url()."pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity_title'>{$url_display}</span> ({$friendlytime})</span></div>";
 		echo "</div>";
 	
 	}
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index cb7424f7d..ecd109978 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' => $vars['url'] . "action/likes/delete?annotation_id=" . $vars['annotation']->id,
+						'href' => elgg_get_site_url() . "action/likes/delete?annotation_id=" . $vars['annotation']->id,
 						'text' => elgg_echo('remove'),
 						'confirm' => elgg_echo('deleteconfirm')
 						));
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
index 6df6d5edd..335fb55e5 100644
--- a/views/default/canvas/layouts/administration.php
+++ b/views/default/canvas/layouts/administration.php
@@ -413,7 +413,7 @@ table.mceLayout {
 	text-decoration:none;
 	border: 1px solid #0054A7;
 	background-color:#0054A7;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat: repeat-x;
 	background-position: left 10px;
 	-webkit-border-radius: 5px;
@@ -430,7 +430,7 @@ table.mceLayout {
 	border-color: #333333;
 	text-decoration:none;
 	background-color:#333333;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
@@ -447,7 +447,7 @@ table.mceLayout {
 	text-decoration:none;
 	border: 1px solid #0054A7;
 	background-color:#0054A7;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 	-webkit-border-radius: 5px;
@@ -465,7 +465,7 @@ table.mceLayout {
 	border-color: #333333;
 	text-decoration:none;
 	background-color:#333333;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
@@ -475,7 +475,7 @@ table.mceLayout {
 	text-decoration:none;
 	color: #333333;
 	background-color:#dddddd;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 	border: 1px solid #999999;
@@ -501,7 +501,7 @@ table.mceLayout {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	background-color:#cccccc;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_background.gif);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
 	background-position: 0 0;
 	border:1px solid #999999;
@@ -520,7 +520,7 @@ table.mceLayout {
 .admin_area input.action_button:focus,
 .admin_area a.action_button:focus {
 	background-position:0 -15px;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_background.gif);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
 	color:#111111;
 	text-decoration: none;
@@ -876,9 +876,9 @@ ul.admin_plugins {
 
 <div id="admin_header">
 	<span class="network_title"><h2>
-	<a href="<?php echo $vars['url']; ?>">
+	<a href="<?php echo elgg_get_site_url(); ?>">
 	<?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></a>
-	<a class="return_to_network" href="<?php echo $vars['url']; ?>">&lt;&lt; Return to network</a>
+	<a class="return_to_network" href="<?php echo elgg_get_site_url(); ?>">&lt;&lt; Return to network</a>
 	</h2></span>
 </div>
 
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 001755932..45eff55c6 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -61,8 +61,8 @@
 	</h3>
 </td>
 <td width="17px" align="right"></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
 </tr></table>
 
 <?php
@@ -130,8 +130,8 @@ if(get_context() != "profile"){ /* on groups */
 			</h3>
 		</td>
 		<td width="17px" align="right"></td>
-		<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-		<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+		<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
+		<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
 		</tr></table>
 		
 		<?php
@@ -175,8 +175,8 @@ if(get_context() != "profile"){ /* on groups */
 	</h3>
 </td>
 <td width="17px" align="right"></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
 </tr></table>
 
 <?php
@@ -216,8 +216,8 @@ if(get_context() != "profile"){ /* on groups */
 	</h3>
 </td>
 <td width="17px" align="right"></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
 </tr></table>
 
 <?php
@@ -239,7 +239,7 @@ if(get_context() != "profile"){ /* on groups */
 
 </div><!-- /#customise_page_view -->
 
-<form action="<?php echo $vars['url']; ?>action/widgets/reorder" method="post">
+<form action="<?php echo elgg_get_site_url(); ?>action/widgets/reorder" method="post">
 <?php echo elgg_view('input/securitytoken'); ?>
 <textarea type="textarea" value="Left widgets"   style="display:none" name="debugField1" id="debugField1" /><?php echo $leftcolumn_widgets; ?></textarea>
 <textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea>
diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index 0717daf64..4e2e23a6f 100644
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -13,7 +13,7 @@
 		 $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
 		 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post"))) . "</div>";
 		 
-		 echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add"));
+		 echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/comments/add"));
 
     }
     
diff --git a/views/default/css.php b/views/default/css.php
index d48f31442..b4d88e7d9 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -230,13 +230,13 @@ h2 {
 	width:14px;
 	height:14px;
 	float:right;
-	background-image:url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-repeat: no-repeat;
 	background-position: -250px top;
 	text-indent: -1000em;
 }
 .tags {
-	background-image:url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-repeat: no-repeat;
 	background-position: left -196px;
 	padding:1px 0 0 14px;
@@ -247,7 +247,7 @@ h2 {
 }
 .ajax_loader {
 	background-color: white;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/ajax_loader_bw.gif);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
 	background-repeat: no-repeat;
 	background-position: center center;
 	min-height:33px;
@@ -267,7 +267,7 @@ h2 {
 	PAGE LAYOUT - MAIN BLOCKS POSITIONING
 *************************************** */
 #elgg_topbar {
-	background:#333333 url(<?php echo $vars['url']; ?>_graphics/toptoolbar_background.gif) repeat-x top left;
+	background:#333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	color:#eeeeee;
 	border-bottom:1px solid #000000;
 	min-width:998px;
@@ -282,7 +282,7 @@ h2 {
 	width: 100%;
 	height:90px;
 	background-color: #4690D6;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/header_shadow.png);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png);
 	background-repeat: repeat-x;
 	background-position: bottom left;
 }
@@ -315,7 +315,7 @@ h2 {
 	min-height:400px;
 }
 #elgg_content.sidebar { /* class on #elgg_content div to give a full-height sidebar background */
-	background-image:url(<?php echo $vars['url']; ?>_graphics/sidebar_background.gif);
+	background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
 	background-repeat:repeat-y;
 	background-position: right top;
 }
@@ -397,7 +397,7 @@ h2 {
 	color:#71cbff;
 }
 #elgg_topbar_contents a.myfriends {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat left -297px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -297px;
 	margin-right:30px;
 	text-indent: -900em;
 	width:36px;
@@ -406,19 +406,19 @@ h2 {
 	background-position: left -337px;
 }
 #elgg_topbar_contents a.settings {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
 #elgg_topbar_contents a.admin {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
 	padding-left:20px !important;
 	float:right;
 	margin-right:30px;
 }
 #elgg_topbar_contents a.help {
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat -300px -133px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -133px;
 	padding-left:18px !important;
 	float:right;
 	margin-right:30px;
@@ -449,7 +449,7 @@ h2 {
 	margin:0;
 	padding:2px 4px 2px 26px;
 	width:198px;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-position: 2px -220px;
 	background-repeat: no-repeat;
 }
@@ -542,7 +542,7 @@ li.navigation_more:hover a {
 	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 }
 li.navigation_more a.subnav span {
-	background-image: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-repeat: no-repeat;
 	background-position: -150px -56px;
 	padding-left: 12px;
@@ -1162,7 +1162,7 @@ a.longtext_control {
 	text-decoration:none;
 	border: 1px solid #4690d6;
 	background-color:#4690d6;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat: repeat-x;
 	background-position: left 10px;
 	-webkit-border-radius: 5px;
@@ -1179,7 +1179,7 @@ a.longtext_control {
 	border-color: #0054a7;
 	text-decoration:none;
 	background-color:#0054a7;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
@@ -1206,7 +1206,7 @@ input[type="submit"] {
 	text-decoration:none;
 	border: 1px solid #4690d6;
 	background-color:#4690d6;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 	-webkit-border-radius: 5px;
@@ -1224,7 +1224,7 @@ input[type="submit"]:hover {
 	border-color: #0054a7;
 	text-decoration:none;
 	background-color:#0054a7;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
@@ -1234,7 +1234,7 @@ input[type="submit"]:hover {
 	text-decoration:none;
 	color: #333333;
 	background-color:#dddddd;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 	border: 1px solid #999999;
@@ -1256,7 +1256,7 @@ a.action_button {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	background-color:#cccccc;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_background.gif);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
 	background-position: 0 0;
 	border:1px solid #999999;
@@ -1275,7 +1275,7 @@ a.action_button:hover,
 input.action_button:focus,
 a.action_button:focus {
 	background-position:0 -15px;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_background.gif);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
 	color:#111111;
 	text-decoration: none;
@@ -1336,7 +1336,7 @@ a.action_button:focus {
 	cursor: pointer;
 	width:14px;
 	height:14px;
-	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat -200px top;
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -200px top;
 	text-indent: -9000px;
 	text-align: left;
 }
@@ -1458,16 +1458,16 @@ a.action_button:focus {
 	z-index:1;
 }
 .friends_picker_navigation_l {
-	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat left top;
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat left top;
 }
 .friends_picker_navigation_r {
-	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat -60px top;
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px top;
 }
 .friends_picker_navigation_l:hover {
-	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat left -44px;
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat left -44px;
 }
 .friends_picker_navigation_r:hover {
-	background: url("<?php echo $vars['url']; ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
 }
 .friendspicker_savebuttons .submit_button,
 .friendspicker_savebuttons .cancel_button {
@@ -1491,7 +1491,7 @@ a.action_button:focus {
 }
 .likes_list_holder a.user_like {
 	cursor:pointer;
-	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat left -101px;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -101px;
 	text-indent: -9000em;
 	text-align: left;
 	display:block;
@@ -1506,7 +1506,7 @@ a.action_button:focus {
 .likes_list_holder .likes_list_button.link {
 	float:left;
 	text-align: left;
-	background: url(<?php echo $vars['url']; ?>_graphics/elgg_sprites.png) no-repeat left -131px;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -131px;
 	padding-left:21px;
 	height:20px;
 }
diff --git a/views/default/dashboard/blurb.php b/views/default/dashboard/blurb.php
index c400dc2b9..40b5b70a4 100644
--- a/views/default/dashboard/blurb.php
+++ b/views/default/dashboard/blurb.php
@@ -17,6 +17,6 @@
 ?>
 </p>
 <p>
-	<a href="<?php echo $vars['url']; ?>pages/dashboard/latest.php"><?php echo elgg_echo('content:latest:blurb'); ?></a>
+	<a href="<?php echo elgg_get_site_url(); ?>pages/dashboard/latest.php"><?php echo elgg_echo('content:latest:blurb'); ?></a>
 </p>
 </div>
\ No newline at end of file
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index 5262d3494..636d2ab5c 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' => $vars['url'] . 'action/friends/deletecollection?collection=' . $coll->id,
+			'href' => elgg_get_site_url() . 'action/friends/deletecollection?collection=' . $coll->id,
 			'class' => 'delete_collection'
 		));
 	echo "</div>";
@@ -43,7 +43,7 @@ if ($friends = $vars['collection']->entities) {
 	<script type="text/javascript">
 	$(document).ready(function () {
 
-			$('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+			$('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
 
 	});
 	</script>
diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index 0030536da..f191f2c58 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -30,7 +30,7 @@ $(document).ready(function () {
 
 	$('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
 		// load collection members pane
-		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
 		// remove selected state from previous tab
 		$(this).parent().parent().find("li.selected").removeClass("selected");
@@ -42,7 +42,7 @@ $(document).ready(function () {
 
 	$('a.editmembers<?php echo $friendspicker; ?>').click(function () {
 		// load friends picker pane
-		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo $vars['url']; ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+		$('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
 		// remove selected state from previous tab
 		$(this).parent().parent().find("li.selected").removeClass("selected");
diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php
index df1188fe1..09a16c9ae 100644
--- a/views/default/friends/forms/edit.php
+++ b/views/default/friends/forms/edit.php
@@ -50,4 +50,4 @@ if (isset($vars['collection'])) {
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
 $form_body .= "</p></div>";
 
-echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/$action"));
\ No newline at end of file
+echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/$action"));
\ No newline at end of file
diff --git a/views/default/group/search/finishblurb.php b/views/default/group/search/finishblurb.php
index f802282e7..a21f95881 100644
--- a/views/default/group/search/finishblurb.php
+++ b/views/default/group/search/finishblurb.php
@@ -9,7 +9,7 @@ elgg_deprecated_notice('view groups/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>">
+<div class="contentWrapper"><a href="<?php echo elgg_get_site_url(); ?>pg/search/groups/?tag=<?php echo urlencode($vars['tag']); ?>">
 	<?php
 	echo elgg_echo("group:search:finishblurb");
 	?></a>
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index 28e0cf6a7..67d01c0c7 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -32,7 +32,7 @@ $ac_url_params = http_build_query(array(
 	'match_on' => $vars['match_on'],
 	'match_owner' => $vars['match_owner'],
 ));
-$ac_url = $vars['url'] . 'pg/autocomplete?' . $ac_url_params;
+$ac_url = elgg_get_site_url() . 'pg/autocomplete?' . $ac_url_params;
 
 if (!isset($autocomplete_js_loaded)) {
 	$autocomplete_js_loaded = false;
@@ -49,7 +49,7 @@ if (!$autocomplete_js_loaded) {
 	?>
 
 	<!-- include autocomplete -->
-	<script language="javascript" type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.autocomplete.min.js"></script>
+	<script language="javascript" type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.autocomplete.min.js"></script>
 	<script type="text/javascript">
 	function bindAutocomplete() {
 	$('input[type=text].autocomplete').autocomplete("<?php echo $ac_url; ?>", {
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index f51f9f484..fb98afc97 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -59,10 +59,10 @@ $json_values = json_encode($values);
 if (!$user_picker_js_sent) {
 ?>
 <!-- User picker JS -->
-<script language="javascript" type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.autocomplete.min.js"></script>
+<script language="javascript" type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.autocomplete.min.js"></script>
 <script type="text/javascript">
 // set up a few required variables
-userPickerURL = '<?php echo $vars['url'] ?>pg/livesearch';
+userPickerURL = '<?php echo elgg_get_site_url() ?>pg/livesearch';
 userList = <?php echo $json_values ?>;
 
 function userPickerBindEvents() {
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index 508b2ad82..d438ff3be 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -9,7 +9,7 @@
 
 if (isset($vars['entity']) && isloggedin()) {
 	$guid = $vars['entity']->getGuid();
-	$url = elgg_add_action_tokens_to_url($vars['url'] . "action/likes/add?guid={$guid}");
+	$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
 	
 	echo "<span class='likes_list_holder'>";
 	//check to see if the user has already liked
diff --git a/views/default/likes/forms/link.php b/views/default/likes/forms/link.php
index 34c2848d3..4e52224e2 100644
--- a/views/default/likes/forms/link.php
+++ b/views/default/likes/forms/link.php
@@ -9,7 +9,7 @@
 
 if (isset($vars['entity']) && isloggedin()) {
 	$guid = $vars['entity']->getGuid();
-	$url = elgg_add_action_tokens_to_url($vars['url'] . "action/likes/add?guid={$guid}");
+	$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
 	//check to see if the user has already liked
 	if (!elgg_annotation_exists($guid, 'likes') ) {
 		echo "<span class='river_link_divider'> | </span><a class='river_user_like_button link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
diff --git a/views/default/object/default.php b/views/default/object/default.php
index 7ef563e91..6975804c3 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' => "{$vars['url']}action/entities/delete?guid={$vars['entity']->guid}", 
+			'href' => elgg_get_site_url()."action/entities/delete?guid={$vars['entity']->guid}", 
 			'text' => elgg_echo('delete')
 		));
 		$controls .= " ($delete)";
diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php
index 7b1e7d2df..bef709d7d 100644
--- a/views/default/object/plugin.php
+++ b/views/default/object/plugin.php
@@ -15,5 +15,5 @@ $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'plugin'
 
 ?>
 <div>
-	<?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/plugins/{$prefix}settings/save")); ?>
+	<?php echo elgg_view('input/form', array('body' => $form_body, 'action' => elgg_get_site_url()."action/plugins/{$prefix}settings/save")); ?>
 </div>
\ No newline at end of file
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index a4ecb72da..7270cd5ea 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -57,7 +57,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 		if ($size < 100) {
 			$size = 100;
 		}
-		$url = "{$vars['url']}pg/search/?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
+		$url = elgg_get_site_url()."pg/search/?q=". urlencode($tag->tag) . "&search_type=tags$type$subtype";
 		$list .= "<a href=\"$url\" style=\"font-size: $size%\" title=\"".addslashes($tag->tag)." ($tag->total)\" style=\"text-decoration:none;\">" . htmlentities($tag->tag, ENT_QUOTES, 'UTF-8') . "</a>";
 	}
 	
@@ -65,7 +65,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
 	
 	if ($context != 'tags') {
 		$cloud .= '<p class="tags">';
-		$cloud .= "<a href=\"{$vars['url']}pg/tags\">All site tags</a>";
+		$cloud .= "<a href=\"".elgg_get_site_url()."pg/tags\">All site tags</a>";
 		$cloud .= '</p>';
 	}
 	
diff --git a/views/default/output/tags.php b/views/default/output/tags.php
index 99c898de6..6c8115d54 100644
--- a/views/default/output/tags.php
+++ b/views/default/output/tags.php
@@ -43,7 +43,7 @@ if (!empty($vars['tags'])) {
 			$type = "";
 		}
 		if (is_string($tag)) {
-			$tagstr .= "<a rel=\"tag\" href=\"{$vars['url']}pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
+			$tagstr .= "<a rel=\"tag\" href=\"".elgg_get_site_url()."pg/search/?q=".urlencode($tag) . "&search_type=tags{$type}{$subtype}{$object}\">" . htmlentities($tag, ENT_QUOTES, 'UTF-8') . "</a>";
 		}
 	}
 	echo $tagstr;
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 6ae5849ae..3704e9a49 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'] : "{$vars['url']}mod/$type/all.php",
+		'url' => (isset($vars['all_link'])) ? $vars['all_link'] : elgg_get_site_url()."mod/$type/all.php",
 		'selected' => ($filter_context == 'everyone'),
 	),
 	'mine' => array(
 		'title' => elgg_echo('mine'),
-		'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "{$vars['url']}pg/$type/$username",
+		'url' => (isset($vars['mine_link'])) ? $vars['mine_link'] : elgg_get_site_url()."pg/$type/$username",
 		'selected' => ($filter_context == 'mine'),
 	),
 	'friend' => array(
 		'title' => elgg_echo('friends'),
-		'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "{$vars['url']}pg/$type/$username/friends",
+		'url' => (isset($vars['friend_link'])) ? $vars['friend_link'] : elgg_get_site_url()."pg/$type/$username/friends",
 		'selected' => ($filter_context == 'friends'),
 	),
 );
diff --git a/views/default/page_elements/elgg_footer.php b/views/default/page_elements/elgg_footer.php
index 62ec5a110..6d6fd8965 100644
--- a/views/default/page_elements/elgg_footer.php
+++ b/views/default/page_elements/elgg_footer.php
@@ -13,7 +13,7 @@
 	<div id="elgg_footer_contents" class="clearfloat">
 		<?php echo elgg_view('footer/links'); ?>
 		<a href="http://www.elgg.org" class="powered_by_elgg_badge">
-			<img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
+			<img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
 		</a>
 	</div>
 </div>
diff --git a/views/default/page_elements/elgg_header_logo.php b/views/default/page_elements/elgg_header_logo.php
index 4449c9644..1e5e5269d 100644
--- a/views/default/page_elements/elgg_header_logo.php
+++ b/views/default/page_elements/elgg_header_logo.php
@@ -5,6 +5,6 @@
  **/
 ?>
 
-<h1><a href="<?php echo $vars['url']; ?>">
+<h1><a href="<?php echo elgg_get_site_url(); ?>">
 <span class='network_title'><?php echo $vars['config']->sitename; ?></span>
 </a></h1>
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index e88cb0fac..4908625e4 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -11,7 +11,7 @@ if (($user instanceof ElggUser) && ($user->guid > 0)) {
 	
 	// Elgg logo
 	echo '<a href="http://www.elgg.org">';
-	echo "<img class=\"site_logo\" src=\"{$vars['url']}_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
+	echo "<img class=\"site_logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
 	echo '</a>';
 	
 	// avatar
@@ -31,12 +31,12 @@ if (($user instanceof ElggUser) && ($user->guid > 0)) {
 	
 	// user settings
 	$settings = elgg_echo('settings');
-	echo "<a href=\"{$vars['url']}pg/settings\" class=\"settings\">$settings</a>";
+	echo "<a href=\"".elgg_get_site_url()."pg/settings\" class=\"settings\">$settings</a>";
 
 	// The administration link is for admin or site admin users only
 	if ($user->isAdmin()) {
 		$admin = elgg_echo("admin");
-		echo "<a href=\"{$vars['url']}pg/admin\" class=\"admin\">$admin</a>";
+		echo "<a href=\"".elgg_get_site_url()."pg/admin\" class=\"admin\">$admin</a>";
 	}
 	
 	echo '</div>';
diff --git a/views/default/page_elements/elgg_topbar_logout.php b/views/default/page_elements/elgg_topbar_logout.php
index d37c5f126..ca3d16707 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' => "{$vars['url']}action/logout",
+	'href' => elgg_get_site_url()."action/logout",
 	'text' => elgg_echo('logout'),
 	'is_action' => TRUE
 ));
diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php
index 7b1204c18..37a9999f0 100644
--- a/views/default/page_elements/html_begin.php
+++ b/views/default/page_elements/html_begin.php
@@ -48,12 +48,12 @@ $release = get_version(true);
 	<meta name="ElggRelease" content="<?php echo $release; ?>" />
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
 	<title><?php echo $title; ?></title>
-	<link rel="SHORTCUT ICON" href="<?php echo $vars['url']; ?>_graphics/favicon.ico" />
+	<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
 
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
 
 	<?php
 		echo $feedref;
@@ -65,20 +65,20 @@ $release = get_version(true);
 	if (isset($pickerinuse) && $pickerinuse == true) {
 ?>
 	<!-- only needed on pages where we have friends collections and/or the friends picker -->
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.easing.1.3.packed.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=friendsPickerv1&amp;viewtype=<?php echo $vars['view']; ?>"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.easing.1.3.packed.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=friendsPickerv1&amp;viewtype=<?php echo $vars['view']; ?>"></script>
 <?php
 	}
 ?>
 	<!-- include the default css file -->
-	<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;viewtype=<?php echo $vars['view']; ?>" type="text/css" />
+	<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;viewtype=<?php echo $vars['view']; ?>" type="text/css" />
 
 	<!--[if IE 6]>
-		<link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>views/default/css_ie6.php" />
+		<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie6.php" />
 	<![endif]-->
 
 	<!--[if gt IE 6]>
-		<link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>views/default/css_ie.php" />
+		<link rel="stylesheet" type="text/css" href="<?php echo elgg_get_site_url(); ?>views/default/css_ie.php" />
 	<![endif]-->
 <?php
 	echo elgg_view('metatags', $vars);
diff --git a/views/default/page_elements/html_begin_admin.php b/views/default/page_elements/html_begin_admin.php
index a35cafb3f..34a70b60e 100644
--- a/views/default/page_elements/html_begin_admin.php
+++ b/views/default/page_elements/html_begin_admin.php
@@ -17,12 +17,12 @@ $release = get_version(true);
 	<meta name="ElggRelease" content="<?php echo $release; ?>" />
 	<meta name="ElggVersion" content="<?php echo $version; ?>" />
 	<title><?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></title>
-	<link rel="shortcut icon" href="<?php echo $vars['url']; ?>_graphics/favicon.ico" />
+	<link rel="shortcut icon" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" />
 
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
-	<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.4.2.min.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.form.js"></script>
+	<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&amp;js=initialise_elgg&amp;viewtype=<?php echo $vars['view']; ?>"></script>
 
 	<?php
 		echo $feedref;
@@ -31,7 +31,7 @@ $release = get_version(true);
 		}
 ?>
 	<!-- include the admin css file 
-	<link rel="stylesheet" href="<?php echo $vars['url']; ?>views/default/css_admin.php" type="text/css" />-->
+	<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>views/default/css_admin.php" type="text/css" />-->
 </head>
 
 <body>
diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php
index cb5d1b671..4f88501d9 100644
--- a/views/default/page_shells/walled_garden.php
+++ b/views/default/page_shells/walled_garden.php
@@ -29,7 +29,7 @@ body {background: white;}
 	position:relative;
 	padding:0;
 	width:563px;
-	background: url(<?php echo $vars['url']; ?>_graphics/walled_garden_background_extend.gif) repeat-y left top;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_extend.gif) repeat-y left top;
 	text-align: left;
 	word-wrap:break-word;
 }
@@ -38,11 +38,11 @@ body {background: white;}
 	padding:0;
 	width:563px;
 	min-height:230px;
-	background: url(<?php echo $vars['url']; ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
 }
 #walledgarden_bottom {
 	margin:0 auto;
-	background: url(<?php echo $vars['url']; ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
 	width:563px;
 	height:54px;
 	/* position: relative; */
@@ -154,7 +154,7 @@ body {background: white;}
 	text-decoration:none;
 	border: 1px solid #4690d6;
 	background-color:#4690d6;
-	background-image: url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat: repeat-x;
 	background-position: left 10px;
 	-webkit-border-radius: 5px;
@@ -171,7 +171,7 @@ body {background: white;}
 	border-color: #0054a7;
 	text-decoration:none;
 	background-color:#0054a7;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_graduation.png);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
 	background-repeat:  repeat-x;
 	background-position:  left 10px;
 }
@@ -179,7 +179,7 @@ body {background: white;}
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	background-color:#cccccc;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_background.gif);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
 	background-position: 0 0;
 	border:1px solid #999999;
@@ -196,7 +196,7 @@ body {background: white;}
 .walledgardenlogin input.action_button:hover,
 .walledgardenlogin input.action_button:focus {
 	background-position:0 -15px;
-	background-image:  url(<?php echo $vars['url']; ?>_graphics/button_background.gif);
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
 	color:#111111;
 	text-decoration: none;
@@ -234,7 +234,7 @@ body {background: white;}
 	width:260px;
 	background-color: white;
 	padding:0;
-	background: url(<?php echo $vars['url']; ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
 	height:auto;
 }
 #hiddenform_body {
@@ -243,7 +243,7 @@ body {background: white;}
 }
 #hiddenform_bottom {
 	margin:0 auto;
-	background: url(<?php echo $vars['url']; ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
+	background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
 	width:563px;
 	height:54px;
 	position: relative;
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 3b3aaf808..7371ac71f 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -11,7 +11,7 @@
 
 // Set action appropriately
 if (!isset($vars['action'])) {
-	$action = $vars['url'] . "action/systemsettings/save";
+	$action = elgg_get_site_url() . "action/systemsettings/save";
 } else {
 	$action = $vars['action'];
 }
diff --git a/views/default/settings/upgrading.php b/views/default/settings/upgrading.php
index 9f13e4c3f..19bc13879 100644
--- a/views/default/settings/upgrading.php
+++ b/views/default/settings/upgrading.php
@@ -8,13 +8,13 @@
 <html>
 	<head>
 		<title><?php echo elgg_echo('upgrading'); ?></title>
-		<meta http-equiv="refresh" content="1;url=<?php echo $vars['url']; ?>upgrade.php?upgrade=upgrade"/>
+		<meta http-equiv="refresh" content="1;url=<?php echo elgg_get_site_url(); ?>upgrade.php?upgrade=upgrade"/>
 	</head>
 	<body bgcolor="white">
 		<table width="100%" height="100%" border="0" style="margin: 0px; padding: 0px">
 			<tr>
 				<td width="100%" height="100%" valign="middle" align="center">
-					<img src="<?php echo $vars['url']; ?>_graphics/ajax_loader_bw.gif" />
+					<img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif" />
 				</td>
 			</tr>
 		</table>
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index 9c4b1d79d..1e48d6145 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -10,7 +10,7 @@ elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+<a href="<?php echo elgg_get_site_url(); ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
 	echo elgg_echo("user:search:finishblurb");
 	?></a>
 <?php
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 4bce6b228..02ccbc795 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -7,4 +7,4 @@
 $form_body = elgg_view("usersettings/user");
 $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit_button usersettings_save'));
 
-echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body));
\ No newline at end of file
+echo elgg_view('input/form', array('action' => elgg_get_site_url()."action/usersettings/save", 'body' => $form_body));
\ No newline at end of file
diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
index 572624034..5be2df9d4 100644
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/editwrapper.php
@@ -12,7 +12,7 @@ $form_body = $vars['body'];
 $form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
 $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
 
-echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "{$vars['url']}action/widgets/save"))
+echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => elgg_get_site_url()."action/widgets/save"))
 ?>
 <script type="text/javascript">
 $(document).ready(function() {
@@ -28,7 +28,7 @@ $(document).ready(function() {
 		$.post($("#widgetform<?php echo $guid; ?>").attr("action"),variables,function() {
 			$("#submit<?php echo $guid; ?>").attr("disabled","");
 			$("#submit<?php echo $guid; ?>").attr("value","<?php echo elgg_echo("save"); ?>");
-			$("#widgetcontent<?php echo $guid; ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
+			$("#widgetcontent<?php echo $guid; ?>").load("<?php echo elgg_get_site_url(); ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
 		});
 		return false;
 
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index d66563858..c89a878ca 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -87,7 +87,7 @@ if ($callback != "true") {
 <script type="text/javascript">
 $(document).ready(function() {
 
-	$("#widgetcontent<?php echo $vars['entity']->getGUID(); ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $vars['entity']->getGUID(); ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=widget&callback=true");
+	$("#widgetcontent<?php echo $vars['entity']->getGUID(); ?>").load("<?php echo elgg_get_site_url(); ?>pg/view/<?php echo $vars['entity']->getGUID(); ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=widget&callback=true");
 
 	// run function to check for widgets collapsed/expanded state
 	var forWidget = "widget<?php echo $vars['entity']->getGUID(); ?>";
-- 
cgit v1.2.3