9 files changed, 25 insertions, 25 deletions

diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index 0d066bf80..e866037cc 100644
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -40,7 +40,7 @@ if (!$vars['entity']) {
 }
 ?>
 <div class="contentWrapper">
-<form action="<?php echo $vars['url']; ?>action/pages/edit" method="post">
+<form action="<?php echo elgg_get_site_url(); ?>action/pages/edit" method="post">
 <?php
 echo elgg_view('input/securitytoken');
 if (is_array($vars['config']->pages) && sizeof($vars['config']->pages) > 0) {
diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php
index e6d1f925a..625628639 100644
--- a/mod/pages/views/default/forms/pages/editwelcome.php
+++ b/mod/pages/views/default/forms/pages/editwelcome.php
@@ -21,7 +21,7 @@ if($vars['entity']) {
 $page_owner = $vars['owner']->guid;
 
 ?>
-<form action="<?php echo $vars['url']; ?>action/pages/editwelcome" method="post">
+<form action="<?php echo elgg_get_site_url(); ?>action/pages/editwelcome" method="post">
 
 	<p class="longtext_inputarea">
 	<label>
diff --git a/mod/pages/views/default/icon/object/page/medium.php b/mod/pages/views/default/icon/object/page/medium.php
index bb81a9653..ebf028ef7 100644
--- a/mod/pages/views/default/icon/object/page/medium.php
+++ b/mod/pages/views/default/icon/object/page/medium.php
@@ -5,4 +5,4 @@
  * @package ElggPages
  */
 
-echo $vars['url'] . "mod/pages/images/pages_lrg.gif";
+echo elgg_get_site_url() . "mod/pages/images/pages_lrg.gif";
diff --git a/mod/pages/views/default/icon/object/page/small.php b/mod/pages/views/default/icon/object/page/small.php
index 55466f539..850c78a51 100644
--- a/mod/pages/views/default/icon/object/page/small.php
+++ b/mod/pages/views/default/icon/object/page/small.php
@@ -5,4 +5,4 @@
  * @package ElggPages
  */
 
-echo $vars['url'] . "mod/pages/images/pages.gif";
\ No newline at end of file
+echo elgg_get_site_url() . "mod/pages/images/pages.gif";
\ No newline at end of file
diff --git a/mod/pages/views/default/icon/object/page_top/medium.php b/mod/pages/views/default/icon/object/page_top/medium.php
index bb5c367b2..d1200ad61 100644
--- a/mod/pages/views/default/icon/object/page_top/medium.php
+++ b/mod/pages/views/default/icon/object/page_top/medium.php
@@ -5,5 +5,5 @@
  * @package ElggPages
  */
 
-echo $vars['url'] . "mod/pages/images/pages_lrg.gif";
+echo elgg_get_site_url() . "mod/pages/images/pages_lrg.gif";
 ?>
diff --git a/mod/pages/views/default/icon/object/page_top/small.php b/mod/pages/views/default/icon/object/page_top/small.php
index 5be6e578d..bb9e0047a 100644
--- a/mod/pages/views/default/icon/object/page_top/small.php
+++ b/mod/pages/views/default/icon/object/page_top/small.php
@@ -5,4 +5,4 @@
  * @package ElggPages
  */
 
-echo $vars['url'] . "mod/pages/images/pages.gif";
+echo elgg_get_site_url() . "mod/pages/images/pages.gif";
diff --git a/mod/pages/views/default/pages/css.php b/mod/pages/views/default/pages/css.php
index 78298c6a1..48991b904 100644
--- a/mod/pages/views/default/pages/css.php
+++ b/mod/pages/views/default/pages/css.php
@@ -18,7 +18,7 @@
 }
 
 .treeview .hitarea {
-	background: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default.gif) -64px -25px no-repeat;
+	background: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-default.gif) -64px -25px no-repeat;
 	height: 16px;
 	width: 16px;
 	margin-left: -16px;
@@ -44,36 +44,36 @@
 
 .treeview .hover { color: red; cursor: pointer; }
 
-.treeview li { background: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default-line.gif) 0 0 no-repeat; }
+.treeview li { background: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-default-line.gif) 0 0 no-repeat; }
 .treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; }
 
 .treeview .expandable-hitarea { background-position: -80px -3px; }
 
 .treeview li.last { background-position: 0 -1766px }
-.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default.gif); }
+.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-default.gif); }
 .treeview li.lastCollapsable { background-position: 0 -111px }
 .treeview li.lastExpandable { background-position: -32px -67px }
 
 .treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; }
 
-.treeview-red li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-red-line.gif); }
-.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-red.gif); }
+.treeview-red li { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-red-line.gif); }
+.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-red.gif); }
 
-.treeview-black li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-black-line.gif); }
-.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-black.gif); }
+.treeview-black li { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-black-line.gif); }
+.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-black.gif); }
 
-.treeview-gray li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-gray-line.gif); }
-.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-gray.gif); }
+.treeview-gray li { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-gray-line.gif); }
+.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-gray.gif); }
 
-.treeview-famfamfam li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-famfamfam-line.gif); }
-.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-famfamfam.gif); }
+.treeview-famfamfam li { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-famfamfam-line.gif); }
+.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/treeview-famfamfam.gif); }
 
 
 .filetree li { padding: 3px 0 2px 16px; }
 .filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; }
-.filetree span.folder { background: url(<?php echo $vars['url']; ?>mod/pages/images/folder.gif) 0 0 no-repeat; }
-.filetree li.expandable span.folder { background: url(<?php echo $vars['url']; ?>mod/pages/images/folder-closed.gif) 0 0 no-repeat; }
-.filetree span.file { background: url(<?php echo $vars['url']; ?>mod/pages/images/file.gif) 0 0 no-repeat; }
+.filetree span.folder { background: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/folder.gif) 0 0 no-repeat; }
+.filetree li.expandable span.folder { background: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/folder-closed.gif) 0 0 no-repeat; }
+.filetree span.file { background: url(<?php echo elgg_get_site_url(); ?>mod/pages/images/file.gif) 0 0 no-repeat; }
 
 .pagesTreeContainer {
 		margin:0;
@@ -94,7 +94,7 @@
 #pages_page .tags {
 	padding:0 0 0 16px;
 	margin:10px 0 4px 0;
-	background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
 }
 
 #pages_page img[align="left"] {
diff --git a/mod/pages/views/default/pages/metatags.php b/mod/pages/views/default/pages/metatags.php
index b803a32a5..f40cc9b2d 100644
--- a/mod/pages/views/default/pages/metatags.php
+++ b/mod/pages/views/default/pages/metatags.php
@@ -12,14 +12,14 @@ if (empty($treeguid)) {
 }
 ?>
 
-<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/pages/javascript/jquery.treeview.js" ></script>
-<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/pages/javascript/jquery.treeview.async.js" ></script>
+<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/pages/javascript/jquery.treeview.js" ></script>
+<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/pages/javascript/jquery.treeview.async.js" ></script>
 <script type="text/javascript">
 
 	$(document).ready( function() {
 
 		$("#pagesTree").treeview({
-			url: "<?php echo $vars['url']; ?>mod/pages/pagesTree.php",
+			url: "<?php echo elgg_get_site_url(); ?>mod/pages/pagesTree.php",
 			currentpage: "<?php echo get_input('page_guid'); ?>"
 		}, "<?php echo $treeguid; ?>")
 
diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php
index d51fd008a..f42a1a85f 100644
--- a/mod/pages/views/default/widgets/pages/view.php
+++ b/mod/pages/views/default/widgets/pages/view.php
@@ -20,7 +20,7 @@ if (!$num_display) {
 $pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $num_display, 'full_view' => FALSE));
 
 if ($pages) {
-	$pagesurl = $vars['url'] . "pg/pages/owned/" . elgg_get_page_owner()->username;
+	$pagesurl = elgg_get_site_url() . "pg/pages/owned/" . elgg_get_page_owner()->username;
 	$pages .= "<div class=\"pages_widget_singleitem_more\"><a href=\"{$pagesurl}\">" . elgg_echo('pages:more') . "</a></div>";
 }