4 files changed, 8 insertions, 12 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 82c78ae715..e5f4bd824d 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -513,7 +513,7 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
 };
 
 // Listen live search box events
-$('.liveinput').keyup(function() {
+$('.live-search-input').keyup(function() {
 	var str = this.value;
 	if (str.length < 3) { 
 		return;
@@ -538,7 +538,7 @@ $('.liveinput').keyup(function() {
 	});
 });
 
-$('.liveinput').blur(function() {
+$('.live-search-input').blur(function() {
 		setTimeout(function () {
 			var clone = $("#user-search-row-tpl").clone();
         	$("#livesearch").html("");
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 7cea4a59d7..e6f1640691 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -992,17 +992,13 @@ switch ($mode)
 		$result = $db->sql_query_limit($sql, 10);
 		
 		$user_list = array(); 
-		$i = 1;
 		while ($row = $db->sql_fetchrow($result))
 		{	
-			$j = ($i%2)+1;
 			$user_list[] = array("id" => $row['user_id'], "name" => $row['username']);
-			$i++;
 		}
-		
+		$db->sql_freeresult($result);
 		$json_response = new \phpbb\json_response();
-		echo $json_response->send($user_list);
-		exit();
+		$json_response->send($user_list);
 	break;
 	
 	case 'group':
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index e407aed616..a63e38b184 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -9,10 +9,10 @@
 	<fieldset class="fields1 column1">
 	<dl>
 		<dt><label for="username">{L_USERNAME}{L_COLON}</label></dt>
-		<dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox liveinput" autocomplete="off" />
+		<dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox live-search-input" autocomplete="off" />
 			<table class="table1 zebra-list" id="livesearch">
 				<tr id="user-search-row-tpl" style="display: none;">
-					<td><a class="user-search-link user-search-name" target='_blank'></a></td>
+					<td><a class="user-search-link user-search-name" target="_blank"></a></td>
 				</tr>
 			</table>
 		</dd>
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index 1ee4abccd4..bdb5422b55 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -76,10 +76,10 @@
 <tr>
 	<td class="row1"><b class="genmed">{L_USERNAME}{L_COLON}</b></td>
 	<td class="row2">
-		<input class="post liveinput" type="text" name="username" value="{USERNAME}" autocomplete="off" /> 
+		<input class="post live-search-input" type="text" name="username" value="{USERNAME}" autocomplete="off" /> 
 		<table class="tablebg" id="livesearch">
 			<tr id="user-search-row-tpl" style="display: none;">
-				<td><a class="user-search-link user-search-name" target='_blank'></a></td>
+				<td><a class="user-search-link user-search-name" target="_blank"></a></td>
 			</tr>
 		</table>
 	</td>