2 files changed, 10 insertions, 22 deletions
diff --git a/views/default/widgets/friends/content.php b/views/default/widgets/friends/content.php
index e0385027d..98814c244 100644
--- a/views/default/widgets/friends/content.php
+++ b/views/default/widgets/friends/content.php
@@ -1,14 +1,9 @@
 <?php
-
 /**
- * Elgg Friends
  * Friend widget display view
  *
- * @package ElggFriends
- * @subpackage Core
  */
 
-
 // owner of the widget
 $owner = $vars['entity']->getOwnerEntity();
 
@@ -18,20 +13,13 @@ $num = (int) $vars['entity']->num_display;
 // get the correct size
 $size = $vars['entity']->icon_size;
 
-// Get the user's friends
-if ($owner) {
-	$friends = $owner->getFriends("", $num);
-}
-// If there are any friends to view, view them
-if (is_array($friends) && sizeof($friends) > 0) {
-
-	echo "<div id=\"widget_friends_list\">";
-
-	foreach($friends as $friend) {
-		echo "<div class=\"widget_friends_singlefriend\" >";
-		echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size));
-		echo "</div>";
+if (elgg_instanceof($owner, 'user')) {
+	$html = $owner->listFriends('', $num, array(
+		'size' => $size,
+		'list_type' => 'gallery',
+		'pagination' => false
+	));
+	if ($html) {
+		echo $html;
 	}
-
-	echo "</div>";
 }
diff --git a/views/default/widgets/friends/edit.php b/views/default/widgets/friends/edit.php
index 025f5f98b..c7e6b06ff 100644
--- a/views/default/widgets/friends/edit.php
+++ b/views/default/widgets/friends/edit.php
@@ -10,7 +10,7 @@ if (!isset($vars['entity']->num_display)) {
 }
 
 $params = array(
-	'internalname' => 'params[num_display]',
+	'name' => 'params[num_display]',
 	'value' => $vars['entity']->num_display,
 	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 30, 50, 100),
 );
@@ -30,7 +30,7 @@ if (!isset($vars['entity']->icon_size)) {
 }
 
 $params = array(
-	'internalname' => 'params[icon_size]',
+	'name' => 'params[icon_size]',
 	'value' => $vars['entity']->icon_size,
 	'options_values' => array(
 		'small' => elgg_echo('friends:small'),