From: Michael <icarus@dabo.de>
Date: Sat, 26 May 2012 10:06:19 +0000 (+0200)
Subject: Merge branch 'master' of github.com:annando/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=817fc37f41c030381507384db581f62d9a1b5044;p=friendica.git

Merge branch 'master' of github.com:annando/friendica

Conflicts:
	mod/network.php
---

817fc37f41c030381507384db581f62d9a1b5044
diff --cc mod/network.php
index fbfe2de4fd,6b4fa9a5b3..a94272a429
--- a/mod/network.php
+++ b/mod/network.php
@@@ -414,15 -426,24 +426,23 @@@ function network_content(&$a, $update 
  	if($conv) {
  		$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
  		$myurl = substr($myurl,strpos($myurl,'://')+3);
 -		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
 +		$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 . '\\]%'))
+ 			);
+ 
  	}
  
 -
  	if($update) {
  
  		// only setup pagination on initial page view