1 files changed, 5 insertions, 63 deletions
diff --git a/mod/search.php b/mod/search.php
index b53bd45c0..23b2ddb7e 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -65,7 +65,7 @@ function search_content(&$a) {
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, 
+		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
 		`user`.`nickname`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -80,68 +80,10 @@ function search_content(&$a) {
 		dbesc($search)
 	);
 
-	$tpl = load_view_file('view/search_item.tpl');
-	$droptpl = load_view_file('view/wall_fake_drop.tpl');
-
-	$return_url = $_SESSION['return_url'] = $a->cmd;
-
-	if(count($r)) {
-
-		foreach($r as $item) {
-
-			$total       = 0;
-			$comment     = '';
-			$owner_url   = '';
-			$owner_photo = '';
-			$owner_name  = '';
-			$sparkle     = '';
-			
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			$total ++;
-
-			$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
-			$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
-
-
-			$location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$drop = replace_macros($droptpl,array('$id' => $item['id']));
-			$lock = '<div class="wall-item-lock"></div>';
-
-			$o .= replace_macros($tpl,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$profile_url' => $profile_link,
-				'$item_photo_menu' => item_photo_menu($item),				
-				'$name' => $profile_name,
-				'$sparkle' => $sparkle,
-				'$lock' => $lock,
-				'$thumb' => $profile_avatar,
-				'$title' => $item['title'],
-				'$body' => bbcode($item['body']),
-				'$ago' => relative_date($item['created']),
-				'$location' => $location,
-				'$indent' => '',
-				'$owner_url' => $owner_url,
-				'$owner_photo' => $owner_photo,
-				'$owner_name' => $owner_name,
-				'$drop' => $drop,
-				'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $item['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
-			));
-
-		}
-	}
+
+	require_once('include/conversation.php');
+
+	$o .= conversation($a,$r,'search',false);
 
 	$o .= paginate($a);