X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsearch.php;h=df604e367c7724a46118dec997da42e1183b5fce;hb=9259feec6f4b0a24c15f971a3dc8fa54f4f08141;hp=99ec6c5f7d2ec6336465e940d37435c0870818ff;hpb=869a4394661bf1399f44d3f745b0a15c3224d5b2;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 99ec6c5f7d..df604e367c 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -15,9 +15,9 @@ function search_saved_searches() {
 		intval(local_user())
 	);
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		$saved = array();
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$saved[] = array(
 				'id'		=> $rr['id'],
 				'term'		=> $rr['term'],
@@ -43,7 +43,7 @@ function search_saved_searches() {
 }
 
 
-function search_init(&$a) {
+function search_init(App $a) {
 
 	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
@@ -53,7 +53,7 @@ function search_init(&$a) {
 				intval(local_user()),
 				dbesc($search)
 			);
-			if(! count($r)) {
+			if (! dbm::is_result($r)) {
 				q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')",
 					intval(local_user()),
 					dbesc($search)
@@ -81,13 +81,13 @@ function search_init(&$a) {
 
 
 
-function search_post(&$a) {
+function search_post(App $a) {
 	if(x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
 
-function search_content(&$a) {
+function search_content(App $a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
@@ -191,14 +191,12 @@ function search_content(&$a) {
 	if($tag) {
 		logger("Start tag search for '".$search."'", LOGGER_DEBUG);
 
-		$r = q("SELECT STRAIGHT_JOIN %s, %s
+		$r = q("SELECT %s
 			FROM `term`
-				INNER JOIN `item` ON `item`.`id`=`term`.`oid`
-				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
+				STRAIGHT_JOIN `item` ON `item`.`id`=`term`.`oid` %s
 			WHERE %s AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`)) AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s'
 			ORDER BY term.created DESC LIMIT %d , %d ",
-				item_fieldlist(), contact_fieldlist(),
-				contact_condition(), item_condition(),
+				item_fieldlists(), item_joins(), item_condition(),
 				intval(local_user()),
 				intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)),
 				intval($a->pager['start']), intval($a->pager['itemspage']));
@@ -211,19 +209,17 @@ function search_content(&$a) {
 			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
 		}
 
-		$r = q("SELECT STRAIGHT_JOIN %s, %s
-			FROM `item`
-				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND %s
+		$r = q("SELECT %s
+			FROM `item` %s
 			WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
 				$sql_extra
 			GROUP BY `item`.`uri` ORDER BY `item`.`id` DESC LIMIT %d , %d",
-				item_fieldlist(), contact_fieldlist(),
-				contact_condition(), item_condition(),
+				item_fieldlists(), item_joins(), item_condition(),
 				intval(local_user()),
 				intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}