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

Conflicts:
	mod/network.php

3 files changed, 27 insertions, 15 deletions

diff --git a/include/api.php b/include/api.php
index f58a91a72..5697fbdbc 100644
--- a/include/api.php
+++ b/include/api.php
@@ -976,7 +976,7 @@
 		$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
 		$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
 		//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-		
+
 		$start = $page*$count;
 
 		//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
@@ -985,11 +985,19 @@
 		$myurl = substr($myurl,strpos($myurl,'://')+3);
 		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
 		$diasp_url = str_replace('/profile/','/u/',$myurl);
-		$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
-			dbesc($myurl . '$'),
-			dbesc($myurl . '\\]'),
-			dbesc($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 ($max_id > 0)
 			$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
diff --git a/include/config.php b/include/config.php
index 12fc9cafc..6edc3f286 100644
--- a/include/config.php
+++ b/include/config.php
@@ -6,7 +6,7 @@
  * Note:
  * Please do not store booleans - convert to 0/1 integer values
  * The get_?config() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.  
+ * and this could lead to subtle bugs.
  *
  * There are a few places in the code (such as the admin panel) where boolean
  * configurations need to be fixed as of 10/08/2011.
diff --git a/include/dba.php b/include/dba.php
index c9f880241..7ecce7270 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -32,9 +32,9 @@ class dba {
 		if (!(strlen($server) && strlen($user))){
 			$this->connected = false;
 			$this->db = null;
-			return;			
+			return;
 		}
-		
+
 		if($install) {
 			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
@@ -71,23 +71,27 @@ class dba {
 	}
 
 	public function q($sql) {
-		
+
 		if((! $this->db) || (! $this->connected))
 			return false;
-		
+
 		$this->error = '';
 
+		//@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
+
 		if($this->mysqli)
 			$result = @$this->db->query($sql);
 		else
 			$result = @mysql_query($sql,$this->db);
 
+		//@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Stop '."\n", FILE_APPEND);
+
 		if($this->mysqli) {
 			if($this->db->errno)
 				$this->error = $this->db->error;
 		}
 		elseif(mysql_errno($this->db))
-				$this->error = mysql_error($this->db);	
+				$this->error = mysql_error($this->db);
 
 		if(strlen($this->error)) {
 			logger('dba: ' . $this->error);
@@ -107,8 +111,8 @@ class dba {
     			else
 					$mesg = mysql_num_rows($result) . ' results' . EOL;
 			}
-    
-			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg 
+
+			$str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
 				. (($this->error) ? ' error: ' . $this->error : '')
 				. EOL;
 
@@ -146,7 +150,7 @@ class dba {
 			}
 		}
 
-    
+
 		if($this->debug)
 			logger('dba: ' . printable(print_r($r, true)));
 		return($r);