From 2904f4ca0e604f6af8cc1d873326587dafa89a66 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 13 Oct 2021 05:11:36 +0000
Subject: [PATCH] Olq query removed, checking for deleted as well

---
 mod/msearch.php       | 14 --------------
 src/Model/Contact.php |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/mod/msearch.php b/mod/msearch.php
index ce440d1ee2..969446ffb5 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -45,20 +45,6 @@ function msearch_post(App $a)
 
 	$condition = ["`net-publish` AND MATCH(`pub_keywords`) AGAINST (?)", $search];
 	$total = DBA::count('owner-view', $condition);
-	$count_stmt = DBA::p(
-		"SELECT COUNT(*) AS `total`
-			FROM `profile`
-		  	JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			WHERE `profile`.`net-publish`
-		  	AND MATCH(`pub_keywords`) AGAINST (?)",
-		$search
-	);
-	if (DBA::isResult($count_stmt)) {
-		$row = DBA::fetch($count_stmt);
-		$total = $row['total'];
-	}
-
-	DBA::close($count_stmt);
 
 	$search_stmt = DBA::select('owner-view', ['pub_keywords', 'name', 'nickname', 'uid'], $condition, ['limit' => [$startrec, $perpage]]);
 	while ($search_result = DBA::fetch($search_stmt)) {
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 93414d0ff9..236c0b9b99 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -3022,7 +3022,7 @@ class Contact
 			$networks[] = Protocol::OSTATUS;
 		}
 
-		$condition = ['network' => $networks, 'failed' => false, 'uid' => $uid];
+		$condition = ['network' => $networks, 'failed' => false, 'deleted' => false, 'uid' => $uid];
 
 		// check if we search only communities or every contact
 		if ($mode === 'community') {
@@ -3032,7 +3032,7 @@ class Contact
 		$search .= '%';
 
 		$condition = DBA::mergeConditions($condition,
-			["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` where `publish` OR `net-publish`))
+			["(NOT `unsearchable` OR `nurl` IN (SELECT `nurl` FROM `owner-view` WHERE `publish` OR `net-publish`))
 			AND (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?)", $search, $search, $search]);
 
 		$contacts = self::selectToArray([], $condition);