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

Conflicts:
	mod/search.php

diff --cc mod/network.php
index fbfe2de4fd1775008adc2bc6506eef0db4b32b52,a94272a4290fac21307bb6a720ae402db89d3d4e..7c4c1ac04e77f97c5e9a2c30e22bb66be1e7ed39
--- 1/mod/network.php
--- 2/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 6d4bd07e39e7c302018b582654cd51be3bdbb467,d4cd9d96763c7d0838fa2fc72b3e0e00b345df6a..20007ada7776025e25006575bfdcc2f48afc9f40
--- 1/mod/search.php
--- 2/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))));
+       }