aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:15:36 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 22:15:36 +0000
commit9255088a79a034c3cdf4eb46124504b9dd0c838e (patch)
treea225048f7475ea8ddb4820b539f8482655d9da8e /engine
parent323e3ee1dafdf7bdd60607fd960e53957fce770d (diff)
downloadelgg-9255088a79a034c3cdf4eb46124504b9dd0c838e.tar.gz
elgg-9255088a79a034c3cdf4eb46124504b9dd0c838e.tar.bz2
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
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/export.php4
-rw-r--r--engine/lib/relationships.php2
2 files changed, 3 insertions, 3 deletions
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;