aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/actions.php2
-rw-r--r--engine/lib/entities.php2
-rw-r--r--engine/lib/extender.php5
3 files changed, 5 insertions, 4 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index 38fdef1ee..bcd7e759e 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -77,7 +77,7 @@ function action($action, $forwarder = "") {
action_gatekeeper();
}
- $forwarder = str_replace($CONFIG->url, "", $forwarder);
+ $forwarder = str_replace(elgg_get_site_url(), "", $forwarder);
$forwarder = str_replace("http://", "", $forwarder);
$forwarder = str_replace("@", "", $forwarder);
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 58afd178c..1fe657808 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2215,7 +2215,7 @@ function default_entity_icon_hook($hook, $entity_type, $returnvalue, $params) {
}
if (@file_exists($CONFIG->path . $url)) {
- return $CONFIG->url . $url;
+ return elgg_get_site_url().$url;
}
}
}
diff --git a/engine/lib/extender.php b/engine/lib/extender.php
index 0f7ab24ea..845cfd85f 100644
--- a/engine/lib/extender.php
+++ b/engine/lib/extender.php
@@ -229,9 +229,10 @@ function get_extender_url(ElggExtender $extender) {
if ($type == 'volatile') {
$nameid == $extender->name;
}
- $url = $CONFIG->wwwroot . "export/$view/$guid/$type/$nameid/";
+ $url = "export/$view/$guid/$type/$nameid/";
}
- return $url;
+
+ return elgg_normalize_url($url);
}
/** Register the hook */