Refs #2463: Added URL normalization support for entity and extender url handlers

git-svn-id: http://code.elgg.org/elgg/trunk@7203 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index 38fdef1eea5ac17a37dd8e15cacc232850d51f14..bcd7e759ec874ee331a355d166f7b104f64a6be5 100644 (file)
--- 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 58afd178c3ca751b986af73c07681f61aef80cce..1fe657808ccc24869939a89150425e21b60698d6 100644 (file)
--- 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 0f7ab24ea9ba83fb1268b59083c253725161cf19..845cfd85ff4642863792da78cd6fe234a8d2b087 100644 (file)
--- 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 */