From 9255088a79a034c3cdf4eb46124504b9dd0c838e Mon Sep 17 00:00:00 2001 From: ewinslow 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 --- engine/lib/export.php | 4 ++-- engine/lib/relationships.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/lib') diff --git a/engine/lib/export.php b/engine/lib/export.php index eaf2fd3dd..3a5c74a0f 100644 --- a/engine/lib/export.php +++ b/engine/lib/export.php @@ -42,7 +42,7 @@ function get_uuid_from_object($object) { function guid_to_uuid($guid) { global $CONFIG; - return $CONFIG->wwwroot . "export/opendd/$guid/"; + return elgg_get_site_url() . "export/opendd/$guid/"; } /** @@ -55,7 +55,7 @@ function guid_to_uuid($guid) { function is_uuid_this_domain($uuid) { global $CONFIG; - if (strpos($uuid, $CONFIG->wwwroot) === 0) { + if (strpos($uuid, elgg_get_site_url()) === 0) { return true; } diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index 6c43b1757..987ba95b0 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -702,7 +702,7 @@ function get_relationship_url($id) { if ($url == "") { $nameid = $relationship->id; - $url = $CONFIG->wwwroot . "export/$view/$guid/relationship/$nameid/"; + $url = elgg_get_site_url() . "export/$view/$guid/relationship/$nameid/"; } return $url; -- cgit v1.2.3