From 5571ca5b350fd1735f13af7ddfbb88afa6befb0c Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 5 Apr 2010 15:11:05 +0000
Subject: Merged 5487:5525 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5621 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/members/index.php                        | 11 +++++++++--
 mod/members/views/default/members/search.php |  2 --
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'mod/members')

diff --git a/mod/members/index.php b/mod/members/index.php
index 5ad37aa70..1f3b984e5 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -60,8 +60,15 @@ switch($filter){
 		break;
 	// search based on tags
 	case "search_tags":
-		$filter_content = trigger_plugin_hook('search','',$tag,"");
-		$filter_content .= list_entities_from_metadata("", $tag, "user", "", "", 10, false, false);
+		$options = array();
+		$options['query'] = $tag;
+		$options['type'] = "user";
+		$options['offset'] = $offset;
+		$options['limit'] = $limit;
+		$results = trigger_plugin_hook('search', 'tags', $options, array());
+		$count = $results['count'];
+		$users = $results['entities'];
+		$filter_content = elgg_view_entity_list($users, $count, $offset, $limit, false, false, true);
 		break;
 	case "newest":
 	case 'default':
diff --git a/mod/members/views/default/members/search.php b/mod/members/views/default/members/search.php
index 819d8634a..44930ef53 100644
--- a/mod/members/views/default/members/search.php
+++ b/mod/members/views/default/members/search.php
@@ -14,8 +14,6 @@
 <h3><?php echo elgg_echo('members:searchtag'); ?></h3>
 <form id="memberssearchform" action="<?php echo $vars['url']; ?>mod/members/index.php?" method="get">
 	<input type="text" name="tag" value="Member tags" onclick="if (this.value=='Member tags') { this.value='' }" class="search_input" />
-	<input type="hidden" name="subtype" value="" />
-	<input type="hidden" name="object" value="user" />
 	<input type="hidden" name="filter" value="search_tags" />	
 	<input type="submit" value="<?php echo elgg_echo('go'); ?>" />
 </form>
-- 
cgit v1.2.3