From: ewinslow Date: Fri, 25 Feb 2011 20:00:37 +0000 (+0000) Subject: Converted all uses of profile/icon in core + plugins to elgg_view_entity_icon X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f22b65ccceb95ae55619f34f04bb9955ff07574e;p=lorea%2Felgg.git Converted all uses of profile/icon in core + plugins to elgg_view_entity_icon git-svn-id: http://code.elgg.org/elgg/trunk@8471 36083f99-b078-4883-b0ff-0f9b5a30f544 --- diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index 6e83818a9..a70176dc7 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -17,7 +17,7 @@ $container = $blog->getContainerEntity(); $categories = elgg_view('output/categories', $vars); $excerpt = $blog->excerpt; -$owner_icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny')); +$owner_icon = elgg_view_entity_icon($owner, 'tiny'); $owner_link = elgg_view('output/url', array( 'href' => "pg/blog/owner/$owner->username", 'text' => $owner->name, diff --git a/mod/groups/start.php b/mod/groups/start.php index 8490f1c87..5dd590ab8 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -59,7 +59,6 @@ function groups_init() { //extend some views - elgg_extend_view('profile/icon', 'groups/icon'); elgg_extend_view('css/elgg', 'groups/css'); // Access permissions diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index 2ede81bc5..60a0ec853 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -9,11 +9,8 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
"; - echo elgg_view("profile/icon", array( - 'entity' => $group, - 'size' => 'tiny', - 'override' => 'true' - ))."
"; + echo elgg_view_entity_icon($group, 'tiny', array('override' => 'true')); + echo ""; $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}"); ?> diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php index 15ed3b258..303b9aad1 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -9,11 +9,7 @@
"; - echo elgg_view("profile/icon", array( - 'entity' => $request, - 'size' => 'small', - 'override' => 'true' - )); + echo elgg_view_entity_icon($request, 'small', array('override' => 'true')); echo "
"; $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}"); diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 864e8e608..d1c6005ff 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -16,7 +16,7 @@ $poster = $topic->getOwnerEntity(); $group = $topic->getContainerEntity(); $excerpt = elgg_get_excerpt($topic->description); -$poster_icon = elgg_view('profile/icon', array('entity' => $poster, 'size' => 'tiny')); +$poster_icon = elgg_view_entity_icon($poster, 'tiny'); $poster_link = elgg_view('output/url', array( 'href' => $poster->getURL(), 'text' => $poster->name, diff --git a/mod/messages/views/default/object/messages.php b/mod/messages/views/default/object/messages.php index 9e070455b..70a51bf57 100644 --- a/mod/messages/views/default/object/messages.php +++ b/mod/messages/views/default/object/messages.php @@ -19,7 +19,7 @@ if ($full) { if ($message->toId == elgg_get_page_owner_guid()) { // received $user = get_entity($message->fromId); - $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); + $icon = elgg_view_entity_icon($user, 'tiny'); $user_link = elgg_view('output/url', array( 'href' => "pg/messages/compose?send_to=$user->guid", 'text' => $user->name, @@ -34,7 +34,7 @@ if ($message->toId == elgg_get_page_owner_guid()) { } else { // sent $user = get_entity($message->toId); - $icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); + $icon = elgg_view_entity_icon($user, 'tiny'); $user_link = elgg_view('output/url', array( 'href' => "pg/messages/compose?send_to=$user->guid", 'text' => elgg_echo('messages:to_user', array($user->name)), diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index d7ee65f12..31fecf181 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -226,7 +226,7 @@ END; $friend, 'size' => 'tiny', 'override' => true)); + echo elgg_view_entity_icon($friend, 'tiny', array('override' => true)); ?>

diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php index 20555d260..e458469e4 100755 --- a/mod/profile/views/default/profile/owner_block.php +++ b/mod/profile/views/default/profile/owner_block.php @@ -11,11 +11,7 @@ if (!$user) { return TRUE; } -$icon = elgg_view("profile/icon", array( - 'entity' => $user, - 'size' => 'large', - 'override' => 'true' -)); +$icon = elgg_view_entity_icon($user, 'large', array('override' => 'true')); // grab the actions and admin menu items from user hover $menu = elgg_trigger_plugin_hook('register', "menu:user_hover", array('entity' => $user), array()); diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php index dc1337362..30e1cef68 100644 --- a/views/default/annotation/default.php +++ b/views/default/annotation/default.php @@ -6,7 +6,7 @@ */ $owner = get_user($vars['annotation']->owner_guid); -$icon = elgg_view("profile/icon", array('entity' => $owner, 'size' => 'tiny')); +$icon = elgg_view_entity_icon($owner, 'tiny'); $info = elgg_view("output/longtext", array("value" => $vars['annotation']->value)); diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index c55c04c78..04efc6388 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -26,7 +26,7 @@ if (!$entity || !$commenter) { $friendlytime = elgg_view_friendly_time($comment->time_created); -$commenter_icon = elgg_view("profile/icon", array('entity' => $commenter, 'size' => 'tiny')); +$commenter_icon = elgg_view_entity_icon($commenter, 'tiny'); $commenter_link = "getURL()}\">$commenter->name"; $entity_title = $entity->title ? $entity->title : elgg_echo('untitled'); diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php index 2ca129840..2d6a2fec5 100644 --- a/views/default/annotation/likes.php +++ b/views/default/annotation/likes.php @@ -16,7 +16,7 @@ if (!$user) { return true; } -$user_icon = elgg_view("profile/icon", array('entity' => $user, 'size' => 'tiny')); +$user_icon = elgg_view_entity_icon($user, 'tiny'); $user_link = elgg_view('output/url', array( 'href' => $user->getURL(), 'text' => $user->name, diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php index 2df452958..3397a219b 100644 --- a/views/default/core/friends/picker.php +++ b/views/default/core/friends/picker.php @@ -182,7 +182,7 @@ if (!isset($vars['replacement'])) { } //echo "

" . $user->name . "

"; - $label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true)); + $label = elgg_view_entity_icon($friend, 'tiny', array('override' => true)); $options[$label] = $friend->getGUID(); if ($vars['highlight'] == 'all' diff --git a/views/default/core/friends/tablelist.php b/views/default/core/friends/tablelist.php index 8cb6efeda..339b9ab1b 100644 --- a/views/default/core/friends/tablelist.php +++ b/views/default/core/friends/tablelist.php @@ -25,11 +25,11 @@ if (is_array($vars['entities'])) { if ($entity instanceof ElggEntity) { ?> -
- $entity, 'size' => 'tiny')); ?> +
+
- + name; ?> "; if($vars['collection_members']){ $form_body .= elgg_echo("friends:collectionfriends") . "
"; foreach($vars['collection_members'] as $mem){ - $form_body .= elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')); + $form_body .= elgg_view_entity_icon($mem, 'tiny'); $form_body .= $mem->name; } } diff --git a/views/default/river/item/image.php b/views/default/river/item/image.php index afb6b4019..9caa44b36 100644 --- a/views/default/river/item/image.php +++ b/views/default/river/item/image.php @@ -9,4 +9,4 @@ $subject = $vars['item']->getSubjectEntity(); -echo elgg_view("profile/icon", array('entity' => $subject, 'size' => 'small')); +echo elgg_view_entity_icon($subject, 'small'); diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php index 5392105d6..4fbd7b01a 100644 --- a/views/default/river/relationship/friend/create.php +++ b/views/default/river/relationship/friend/create.php @@ -10,8 +10,8 @@ $params = array( 'text' => $object->name, ); $object_link = elgg_view('output/url', $params); -$subject_icon = elgg_view("profile/icon", array('entity' => $subject, 'size' => 'tiny')); -$object_icon = elgg_view("profile/icon", array('entity' => $object, 'size' => 'tiny')); +$subject_icon = elgg_view_entity_icon($subject, 'tiny'); +$object_icon = elgg_view_entity_icon($object, 'tiny'); echo elgg_echo("friends:river:add", array($object_link)); diff --git a/views/default/user/default.php b/views/default/user/default.php index 908b47abe..1e45fccd7 100644 --- a/views/default/user/default.php +++ b/views/default/user/default.php @@ -8,7 +8,7 @@ $user = $vars['entity']; -$icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny')); +$icon = elgg_view_entity_icon($user, 'tiny'); // Simple XFN $rel = ''; diff --git a/views/default/widgets/friends/content.php b/views/default/widgets/friends/content.php index e0385027d..f20f00194 100644 --- a/views/default/widgets/friends/content.php +++ b/views/default/widgets/friends/content.php @@ -29,7 +29,7 @@ if (is_array($friends) && sizeof($friends) > 0) { foreach($friends as $friend) { echo "
"; - echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size)); + echo elgg_view_entity_icon(get_user($friend->guid), $size); echo "
"; }