From 9255088a79a034c3cdf4eb46124504b9dd0c838e Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 30 Oct 2010 22:15:36 +0000
Subject: Refs #2598: Converted virtually all uses of $CONFIG->wwwroot to
 elgg_get_site_url()

git-svn-id: http://code.elgg.org/elgg/trunk@7146 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/page_elements/content_header.php     | 4 ++--
 views/default/usersettings/main_opt/plugins.php    | 2 +-
 views/default/usersettings/main_opt/statistics.php | 2 +-
 views/default/usersettings/main_opt/user.php       | 2 +-
 views/installation/input/button.php                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'views')

diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 91e73f4af..6ae5849ae 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -69,10 +69,10 @@ if (isloggedin()) {
 	} else {
 		// @todo remove the hard coded reference to the videolist plugin
 		if (get_context() == "videolist"){
-			$video_link = $CONFIG->wwwroot . "pg/videolist/browse/$username/";
+			$video_link = elgg_get_site_url() . "pg/videolist/browse/$username/";
 			$new_button = "<a href=\"{$video_link}\" class='action_button'>" . elgg_echo('videolist:browsemenu') . '</a>';
 		} else {
-			$new_link = (isset($vars['new_link'])) ? $vars['new_link'] : "{$CONFIG->wwwroot}pg/$type/$username/new";
+			$new_link = (isset($vars['new_link'])) ? $vars['new_link'] : elgg_get_site_url()."pg/$type/$username/new";
 			$new_button = "<a href=\"{$new_link}\" class='action_button'>" . elgg_echo($type . ':new') . '</a>';
 		}
 		$new_button = "<div class='content_header_options'>$new_button</div>";
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
index 0454a94d2..ab5743d36 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -11,5 +11,5 @@ global $CONFIG;
 <div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
+	<a href="<?php echo elgg_get_site_url() . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
 </div>
\ No newline at end of file
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index 0ca5b5d51..0f3872143 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -9,5 +9,5 @@
 <div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:statistics:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
+	<a href="<?php echo elgg_get_site_url() . "pg/settings/statistics/"; ?>"><?php echo elgg_echo('usersettings:statistics:opt:linktext'); ?></a></p>
 </div>
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
index f6e28d63e..d9f2b5677 100644
--- a/views/default/usersettings/main_opt/user.php
+++ b/views/default/usersettings/main_opt/user.php
@@ -9,5 +9,5 @@
 <div class="menu_admin_option">
 	<h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:user:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
+	<a href="<?php echo elgg_get_site_url() . "pg/settings/user/"; ?>"><?php echo elgg_echo('usersettings:user:opt:linktext'); ?></a></p>
 </div>
\ No newline at end of file
diff --git a/views/installation/input/button.php b/views/installation/input/button.php
index 7b6beec73..1b70800e9 100644
--- a/views/installation/input/button.php
+++ b/views/installation/input/button.php
@@ -44,7 +44,7 @@ $value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
 $name = $vars['internalname'];
 $src = $vars['src'];
 // blank src if trying to access an offsite image.
-if (strpos($src,$CONFIG->wwwroot)===false) {
+if (strpos($src,elgg_get_site_url())===false) {
 	$src = "";
 }
 ?>
-- 
cgit v1.2.3