From: friendica <info@friendica.com>
Date: Tue, 29 May 2012 23:50:42 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=21d79e787ef6a1fd183a4f439c2488110841b530;p=friendica.git

Merge https://github.com/friendica/friendica into pull

Conflicts:
	mod/search.php
---

21d79e787ef6a1fd183a4f439c2488110841b530
diff --cc mod/network.php
index fbfe2de4fd,a94272a429..7c4c1ac04e
--- a/mod/network.php
+++ b/mod/network.php
@@@ -416,11 -428,19 +428,19 @@@ function network_content(&$a, $update 
  		$myurl = substr($myurl,strpos($myurl,'://')+3);
  		$myurl = str_replace('www.','',$myurl);
  		$diasp_url = str_replace('/profile/','/u/',$myurl);
- 		$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
- 			dbesc(protect_sprintf('%' . $myurl)),
- 			dbesc(protect_sprintf('%' . $myurl . ']%')),
- 			dbesc(protect_sprintf('%' . $diasp_url . ']%'))
- 		);
+ 		if (get_config('system','use_fulltext_engine'))
+ 			$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
+ 				dbesc(protect_sprintf($myurl)),
+ 				dbesc(protect_sprintf($myurl)),
+ 				dbesc(protect_sprintf($diasp_url))
+ 			);
+ 		else
+ 			$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
+ 				dbesc(protect_sprintf('%' . $myurl)),
 -				dbesc(protect_sprintf('%' . $myurl . '\\]%')),
 -				dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
++				dbesc(protect_sprintf('%' . $myurl . ']%')),
++				dbesc(protect_sprintf('%' . $diasp_url . ']%'))
+ 			);
+ 
  	}
  
  	if($update) {
diff --cc mod/search.php
index 6d4bd07e39,d4cd9d9676..20007ada77
--- a/mod/search.php
+++ b/mod/search.php
@@@ -109,10 -108,17 +108,17 @@@ function search_content(&$a) 
  	if(! $search)
  		return $o;
  
- 	if($tag)
- 		$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", 	dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
- 	else
- 		$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
+ 	if (get_config('system','use_fulltext_engine')) {
+ 		if($tag)
 -			$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.preg_quote($search));
++			$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.protect_sprintf($search));
+ 		else
 -			$sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(preg_quote($search)));
++			$sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search)));
+ 	} else {
+ 		if($tag)
 -			$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", 	dbesc('\\]' . preg_quote($search) . '\\['));
++			$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", 	dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
+ 		else
 -			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
++			$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
+ 	}