aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-10-29 09:52:17 -0400
committerCash Costello <cash.costello@gmail.com>2011-10-29 09:52:17 -0400
commit0625897f1e47e6cb46c5e4f4d4b6d50f9dd48239 (patch)
treebcef4565b7c7b4c525d0abda8f2672e11ab8c9f8 /engine
parent2cbfc4624135475764d6b5a53b0b95fe980793a2 (diff)
downloadelgg-0625897f1e47e6cb46c5e4f4d4b6d50f9dd48239.tar.gz
elgg-0625897f1e47e6cb46c5e4f4d4b6d50f9dd48239.tar.bz2
Fixes #3920 profile plugin adds a fast loading of user avatars
Diffstat (limited to 'engine')
-rw-r--r--engine/classes/ElggEntity.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 2fa0d7b02..ccf88a6f7 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -1179,16 +1179,16 @@ abstract class ElggEntity extends ElggData implements
return $this->icon_override[$size];
}
- $url = "_graphics/icons/default/$size.png";
- $url = elgg_normalize_url($url);
-
$type = $this->getType();
$params = array(
'entity' => $this,
'size' => $size,
);
- $url = elgg_trigger_plugin_hook('entity:icon:url', $type, $params, $url);
+ $url = elgg_trigger_plugin_hook('entity:icon:url', $type, $params, null);
+ if ($url == null) {
+ $url = "_graphics/icons/default/$size.png";
+ }
return elgg_normalize_url($url);
}