Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile

Rework mod/match and mod/msearch

diff --cc include/api.php
Simple merge

diff --cc mod/admin.php
Simple merge

diff --cc mod/allfriends.php
Simple merge

diff --cc mod/common.php
Simple merge

diff --cc mod/dfrn_poll.php
Simple merge

diff --cc mod/dfrn_request.php
Simple merge

diff --cc mod/display.php
Simple merge

diff --cc mod/events.php
Simple merge

diff --cc mod/message.php
Simple merge

diff --cc mod/network.php
Simple merge

diff --cc mod/profile.php
Simple merge

diff --cc src/Core/Installer.php
Simple merge

diff --cc src/Model/Event.php
index d25f2a151ab8f90af1d17846808ea021635868bc,784a9ffee86a6ec5a7b2e2703f26f408f54b8800..ce77ee7a9376bf51a39d8822f6d26af422b64ed4
--- 1/src/Model/Event.php
--- 2/src/Model/Event.php
+++ b/src/Model/Event.php
@@@ -14,15 -14,11 +14,11 @@@ use Friendica\Core\PConfig
  use Friendica\Core\Renderer;
  use Friendica\Core\System;
  use Friendica\Database\DBA;
 -use Friendica\Model\Contact;
  use Friendica\Util\DateTimeFormat;
  use Friendica\Util\Map;
 +use Friendica\Util\Strings;
  use Friendica\Util\XML;
  
- require_once 'boot.php';
- require_once 'include/dba.php';
- require_once 'include/items.php';
- 
  /**
   * @brief functions for interacting with the event database table
   */

diff --cc src/Model/Profile.php
Simple merge

diff --cc src/Protocol/Diaspora.php
Simple merge

diff --cc src/Protocol/PortableContact.php
Simple merge

diff --cc tests/src/Core/InstallerTest.php
Simple merge