From 2820a231076cc640d2de867faeba2e1a3d45a402 Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 2 Nov 2010 20:59:56 +0000
Subject: Refs #2463: Removed some more instances of $CONFIG->url.  Added
 support for elgg_normalize_url to elgg_add_action_tokens_to_url

git-svn-id: http://code.elgg.org/elgg/trunk@7200 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/entities.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engine/lib/entities.php')

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 1c8db655b..34dc39de5 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -2097,10 +2097,10 @@ function get_entity_icon_url(ElggEntity $entity, $size = 'medium') {
 			return $overrideurl;
 		}
 
-		$url = $CONFIG->url . "_graphics/icons/default/$size.png";
+		$url = "_graphics/icons/default/$size.png";
 	}
 
-	return $url;
+	return elgg_normalize_url($url);
 }
 
 /**
@@ -2137,9 +2137,10 @@ function get_entity_url($entity_guid) {
 		}
 
 		if ($url == "") {
-			$url = $CONFIG->url . "pg/view/" . $entity_guid;
+			$url = "pg/view/" . $entity_guid;
 		}
-		return $url;
+		
+		return elgg_noramlize_url($url);
 
 	}
 
-- 
cgit v1.2.3