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

8 files changed, 9 insertions, 21 deletions

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'])) {
 		<div class="elgg-image-block group_invitations clearfix">
 			<?php
 				echo "<div class='elgg-image'>";
-				echo elgg_view("profile/icon", array(
-					'entity' => $group,
-					'size' => 'tiny',
-					'override' => 'true'
-				))."</div>";
+				echo elgg_view_entity_icon($group, 'tiny', array('override' => 'true'));
+				echo "</div>";
 
 			$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 @@
 		<div class="elgg-image-block group_invitations clearfix">
 				<?php
 					echo "<div class='elgg-image'>";
-					echo elgg_view("profile/icon", array(
-						'entity' => $request,
-						'size' => 'small',
-						'override' => 'true'
-					));
+					echo elgg_view_entity_icon($request, 'small', array('override' => 'true'));
 					echo "</div>";
 					
 					$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;
 	<td class="namefield">
 		<a href="<?php echo $friend->getURL(); ?>">
 <?php
-						echo elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true));
+			echo elgg_view_entity_icon($friend, 'tiny', array('override' => true));
 ?>
 		</a>
 		<p class="namefieldlink">
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());