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

Rework mod/match and mod/msearch

src/Content/ForumManager.php

@@ -15,8 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class handles methods related to the forum functionality
  */

src/Content/Nav.php

@@ -15,9 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 class Nav
 {
 	private static $selected = [

src/Content/OEmbed.php

@@ -23,8 +23,6 @@ use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 /**
  * Handles all OEmbed content fetching and replacement
  *

src/Content/Pager.php

@@ -169,7 +169,7 @@ class Pager
 			'next'  => [
 				'url'   => $this->ensureQueryParameter($this->baseQueryString . '&page=' . ($this->getPage() + 1)),
 				'text'  => L10n::t('older'),
-				'class' =>  'next' . ($displayedItemCount <= 0 ? ' disabled' : '')
+				'class' =>  'next' . ($displayedItemCount < $this->getItemsPerPage() ? ' disabled' : '')
 			]
 		];
 

src/Content/Widget.php

@@ -21,9 +21,6 @@ use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 class Widget
 {
 	/**

src/Content/Widget/CalendarExport.php

@@ -10,9 +10,6 @@ use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * TagCloud widget
  *

src/Content/Widget/TagCloud.php

@@ -13,8 +13,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Util\Security;
 
-require_once 'include/dba.php';
-
 /**
  * TagCloud widget
  *