1 files changed, 57 insertions, 23 deletions
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 61c6172bf..6c84e84ad 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -1,23 +1,57 @@
-<?php
-
-	/**
-	 * Elgg user display
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 */
-
-		if ($vars['full']) {
-			echo elgg_view("profile/userdetails",$vars);
-		} else {
-			if (get_input('search_viewtype') == "gallery") {
-				echo elgg_view('profile/gallery',$vars); 				
-			} else {
-				echo elgg_view("profile/listing",$vars);
-			}
-		}
-	
-?>
-\ No newline at end of file
+<?php
+/**
+ * Elgg user display
+ *
+ * @uses $vars['entity'] ElggUser entity
+ * @uses $vars['size']   Size of the icon
+ */
+
+$entity = $vars['entity'];
+$size = elgg_extract('size', $vars, 'tiny');
+
+$icon = elgg_view_entity_icon($entity, $size, $vars);
+
+// Simple XFN
+$rel = '';
+if (elgg_get_logged_in_user_guid() == $entity->guid) {
+	$rel = 'rel="me"';
+} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $entity->guid)) {
+	$rel = 'rel="friend"';
+}
+
+$title = "<a href=\"" . $entity->getUrl() . "\" $rel>" . $entity->name . "</a>";
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $entity,
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+if (elgg_in_context('owner_block') || elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+if (elgg_get_context() == 'gallery') {
+	echo $icon;
+} else {
+	if ($entity->isBanned()) {
+		$banned = elgg_echo('banned');
+		$params = array(
+			'entity' => $entity,
+			'title' => $title,
+			'metadata' => $metadata,
+		);
+	} else {
+		$params = array(
+			'entity' => $entity,
+			'title' => $title,
+			'metadata' => $metadata,
+			'subtitle' => $entity->briefdescription,
+			'content' => elgg_view('user/status', array('entity' => $entity)),
+		);
+	}
+
+	$list_body = elgg_view('user/elements/summary', $params);
+
+	echo elgg_view_image_block($icon, $list_body, $vars);
+}