diff options
| author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-02 20:59:56 +0000 |
|---|---|---|
| committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-02 20:59:56 +0000 |
| commit | 2820a231076cc640d2de867faeba2e1a3d45a402 (patch) | |
| tree | 1fd80c05de913fb0c53f38ada6caef36e310d545 /engine/lib/entities.php | |
| parent | b314a9a072d301e2e89c4873d76429ba46e9c94a (diff) | |
| download | elgg-2820a231076cc640d2de867faeba2e1a3d45a402.tar.gz elgg-2820a231076cc640d2de867faeba2e1a3d45a402.tar.bz2 | |
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
Diffstat (limited to 'engine/lib/entities.php')
| -rw-r--r-- | engine/lib/entities.php | 9 |
1 files changed, 5 insertions, 4 deletions
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); } |