From 59bbd848d809da169e0d6baadce4890ac375b90b Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 2 Nov 2010 21:34:52 +0000
Subject: 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
---
 engine/lib/actions.php  | 2 +-
 engine/lib/entities.php | 2 +-
 engine/lib/extender.php | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'engine')

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 */
-- 
cgit v1.2.3