3 files changed, 49 insertions, 29 deletions

diff --git a/views/default/user/default.php b/views/default/user/default.php
index 2abc19991..6c84e84ad 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -2,49 +2,56 @@
 /**
  * Elgg user display
  *
- * @package Elgg
- * @subpackage Core
+ * @uses $vars['entity'] ElggUser entity
+ * @uses $vars['size']   Size of the icon
  */
 
-$user = $vars['entity'];
+$entity = $vars['entity'];
+$size = elgg_extract('size', $vars, 'tiny');
 
-$icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny'));
+$icon = elgg_view_entity_icon($entity, $size, $vars);
 
 // Simple XFN
 $rel = '';
-if (elgg_get_logged_in_user_guid() == $user->guid) {
+if (elgg_get_logged_in_user_guid() == $entity->guid) {
 	$rel = 'rel="me"';
-} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $user->guid)) {
+} elseif (check_entity_relationship(elgg_get_logged_in_user_guid(), 'friend', $entity->guid)) {
 	$rel = 'rel="friend"';
 }
 
-$title = "<a href=\"" . $user->getUrl() . "\" $rel>" . $user->name . "</a>";
+$title = "<a href=\"" . $entity->getUrl() . "\" $rel>" . $entity->name . "</a>";
 
-
-$metadata = "<ul class=\"elgg-list-metadata\"><li>$user->location</li>";
-$metadata .= elgg_view("entity/metadata", array('entity' => $user));
-$metadata .= "</ul>";
+$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 ($user->isBanned()) {
-	$params = array(
-		'entity' => $user,
-		'title' => $title,
-		'metadata' => '<ul class="elgg-list-metadata"><li>banned</li></ul>',
-	);
+if (elgg_get_context() == 'gallery') {
+	echo $icon;
 } else {
-	$params = array(
-		'entity' => $user,
-		'title' => $title,
-		'metadata' => $metadata,
-		'subtitle' => $user->briefdescription,
-		'content' => elgg_view('user/status', array('entity' => $user)),
-	);
+	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);
 }
-
-$list_body = elgg_view('layout/objects/list/body', $params);
-
-echo elgg_view_image_block($icon, $list_body);
diff --git a/views/default/user/elements/summary.php b/views/default/user/elements/summary.php
new file mode 100644
index 000000000..46d11c14c
--- /dev/null
+++ b/views/default/user/elements/summary.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * User summary
+ *
+ * @uses $vars['entity']    ElggEntity
+ * @uses $vars['title']     Title link (optional) false = no title, '' = default
+ * @uses $vars['metadata']  HTML for entity metadata and actions (optional)
+ * @uses $vars['subtitle']  HTML for the subtitle (optional)
+ * @uses $vars['tags']      HTML for the tags (optional)
+ * @uses $vars['content']   HTML for the entity content (optional)
+ */
+
+echo elgg_view('object/elements/summary', $vars);
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index 1e48d6145..a3878a803 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -10,7 +10,7 @@ elgg_deprecated_notice('view user/search/finishblurb was deprecated.', 1.7);
 if ($vars['count'] > $vars['threshold']) {
 
 ?>
-<a href="<?php echo elgg_get_site_url(); ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+<a href="<?php echo elgg_get_site_url(); ?>search/users?tag=<?php echo urlencode($vars['tag']); ?>"><?php
 	echo elgg_echo("user:search:finishblurb");
 	?></a>
 <?php