Merged r6757:6810 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 34 insertions, 44 deletions

diff --git a/mod/friends/views/default/widgets/friends/view.php b/mod/friends/views/default/widgets/friends/view.php
index ab702399a..4532e7ace 100644
--- a/mod/friends/views/default/widgets/friends/view.php
+++ b/mod/friends/views/default/widgets/friends/view.php
@@ -1,50 +1,40 @@
 <?php
 
-    /**
-	 * Elgg Friends
-	 * Friend widget options
-	 * 
-	 * @package ElggFriends
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
-	 */
-	
-
-    //the page owner
-	$owner = get_user($vars['entity']->owner_guid);
-
-    //the number of files to display
-	$num = (int) $vars['entity']->num_display;
-	if (!$num)
-		$num = 8;
-		
-	//get the correct size
-	$size = (int) $vars['entity']->icon_size;
-	if (!$size || $size == 1){
-		$size_value = "small";
-	}else{
-    	$size_value = "tiny";
-	}
-		
-    // Get the users friends
-	$friends = $owner->getFriends("", $num, $offset = 0);
-		
-	// If there are any $friend to view, view them
-	if (is_array($friends) && sizeof($friends) > 0) {
+/**
+ * Elgg Friends
+ * Friend widget display view
+ *
+ * @package ElggFriends
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+
+// owner of the profile page
+$owner = get_user($vars['entity']->owner_guid);
+
+// the number of friends to display
+$num = (int) $vars['entity']->num_display;
 
-		echo "<div id=\"widget_friends_list\">";
+// get the correct size
+$size = $vars['entity']->icon_size;
 
-		foreach($friends as $friend) {
-			echo "<div class=\"widget_friends_singlefriend\" >";
-			echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size_value));
-			echo "</div>";
-		}
+// Get the user's friends
+$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>";
-			
-    }
-	
-?>
\ No newline at end of file
+	}
+
+	echo "</div>";
+}