diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-12 21:59:10 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-12 21:59:10 +0000 |
| commit | daadd01b5eaf9da933a9fa35a0dec57bdca790a6 (patch) | |
| tree | f95157388d314a0dc549f48dd9cfc2dad0fecd86 /engine/classes | |
| parent | 59efd0b27c25fa0f759dbfd4ec29061d86b6c402 (diff) | |
| download | elgg-daadd01b5eaf9da933a9fa35a0dec57bdca790a6.tar.gz elgg-daadd01b5eaf9da933a9fa35a0dec57bdca790a6.tar.bz2 | |
Refs #650: Replaced uses of get_metadata_for_entity() by elgg_get_metadata().
git-svn-id: http://code.elgg.org/elgg/trunk@8177 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/classes')
| -rw-r--r-- | engine/classes/ElggEntity.php | 13 | ||||
| -rw-r--r-- | engine/classes/ElggFile.php | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php index cf716b37d..2adb322de 100644 --- a/engine/classes/ElggEntity.php +++ b/engine/classes/ElggEntity.php @@ -128,7 +128,10 @@ abstract class ElggEntity extends ElggData implements return; } - $metadata_array = get_metadata_for_entity($this->guid); + $metadata_array = elgg_get_metadata(array( + 'guid' => $this->guid, + 'limit' => 0 + )); $this->attributes['guid'] = ""; @@ -871,7 +874,7 @@ abstract class ElggEntity extends ElggData implements * * Plugins can register for the 'entity:icon:url', <type> plugin hook * to customize the icon for an entity. - * + * * @param string $size Size of the icon: tiny, small, medium, large * * @return string The URL @@ -887,15 +890,15 @@ abstract class ElggEntity extends ElggData implements $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); - + return elgg_normalize_url($url); } diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php index 2a0d6fb28..961a6ef13 100644 --- a/engine/classes/ElggFile.php +++ b/engine/classes/ElggFile.php @@ -315,7 +315,11 @@ class ElggFile extends ElggObject { // If filestore meta set then retrieve filestore // @todo Better way of doing this? - $metas = get_metadata_for_entity($this->guid); + // ^ Yes....yes there is. + $metas = elgg_get_metadata(array( + 'guid' => $this->guid, + 'limit' => 0 + )); $parameters = array(); if (is_array($metas)) { foreach ($metas as $meta) { |